1
0
mirror of https://github.com/adtools/clib2.git synced 2025-12-08 14:59:05 +00:00

c.lib 1.179 (22.10.2004)

- The scanf() family no longer assumes that a leading '0' indicates that the
  following digits form an octal number if the conversion type has been
  specified as already '%x' already.


git-svn-id: file:///Users/olsen/Code/migration-svn-zu-git/logical-line-staging/clib2/trunk@14752 87f5fb63-7c3d-0410-a384-fd976d0f7a62
This commit is contained in:
Olaf Barthel
2004-10-22 10:57:53 +00:00
parent aa3ccda8de
commit b8663a4240
18 changed files with 66 additions and 51 deletions

View File

@ -1,6 +1,6 @@
#define VERSION 1 #define VERSION 1
#define REVISION 178 #define REVISION 179
#define DATE "7.10.2004" #define DATE "22.10.2004"
#define VERS "amiga.lib 1.178" #define VERS "amiga.lib 1.179"
#define VSTRING "amiga.lib 1.178 (7.10.2004)\r\n" #define VSTRING "amiga.lib 1.179 (22.10.2004)\r\n"
#define VERSTAG "\0$VER: amiga.lib 1.178 (7.10.2004)" #define VERSTAG "\0$VER: amiga.lib 1.179 (22.10.2004)"

View File

@ -1 +1 @@
178 179

View File

@ -1,6 +1,6 @@
#define VERSION 1 #define VERSION 1
#define REVISION 178 #define REVISION 179
#define DATE "7.10.2004" #define DATE "22.10.2004"
#define VERS "c.lib 1.178" #define VERS "c.lib 1.179"
#define VSTRING "c.lib 1.178 (7.10.2004)\r\n" #define VSTRING "c.lib 1.179 (22.10.2004)\r\n"
#define VERSTAG "\0$VER: c.lib 1.178 (7.10.2004)" #define VERSTAG "\0$VER: c.lib 1.179 (22.10.2004)"

View File

@ -1 +1 @@
178 179

View File

@ -1,3 +1,10 @@
c.lib 1.179 (22.10.2004)
- The scanf() family no longer assumes that a leading '0' indicates that the
following digits form an octal number if the conversion type has been
specified as already '%x' already.
c.lib 1.178 (7.10.2004) c.lib 1.178 (7.10.2004)
- The OS4 version had floating point math support code enabled in all - The OS4 version had floating point math support code enabled in all

View File

@ -1,6 +1,6 @@
#define VERSION 1 #define VERSION 1
#define REVISION 178 #define REVISION 179
#define DATE "7.10.2004" #define DATE "22.10.2004"
#define VERS "debug.lib 1.178" #define VERS "debug.lib 1.179"
#define VSTRING "debug.lib 1.178 (7.10.2004)\r\n" #define VSTRING "debug.lib 1.179 (22.10.2004)\r\n"
#define VERSTAG "\0$VER: debug.lib 1.178 (7.10.2004)" #define VERSTAG "\0$VER: debug.lib 1.179 (22.10.2004)"

View File

@ -1 +1 @@
178 179

View File

@ -1,6 +1,6 @@
#define VERSION 1 #define VERSION 1
#define REVISION 178 #define REVISION 179
#define DATE "7.10.2004" #define DATE "22.10.2004"
#define VERS "m.lib 1.178" #define VERS "m.lib 1.179"
#define VSTRING "m.lib 1.178 (7.10.2004)\r\n" #define VSTRING "m.lib 1.179 (22.10.2004)\r\n"
#define VERSTAG "\0$VER: m.lib 1.178 (7.10.2004)" #define VERSTAG "\0$VER: m.lib 1.179 (22.10.2004)"

View File

@ -1 +1 @@
178 179

View File

@ -1,6 +1,6 @@
#define VERSION 1 #define VERSION 1
#define REVISION 178 #define REVISION 179
#define DATE "7.10.2004" #define DATE "22.10.2004"
#define VERS "m881.lib 1.178" #define VERS "m881.lib 1.179"
#define VSTRING "m881.lib 1.178 (7.10.2004)\r\n" #define VSTRING "m881.lib 1.179 (22.10.2004)\r\n"
#define VERSTAG "\0$VER: m881.lib 1.178 (7.10.2004)" #define VERSTAG "\0$VER: m881.lib 1.179 (22.10.2004)"

View File

@ -1 +1 @@
178 179

View File

@ -1,6 +1,6 @@
#define VERSION 1 #define VERSION 1
#define REVISION 178 #define REVISION 179
#define DATE "7.10.2004" #define DATE "22.10.2004"
#define VERS "net.lib 1.178" #define VERS "net.lib 1.179"
#define VSTRING "net.lib 1.178 (7.10.2004)\r\n" #define VSTRING "net.lib 1.179 (22.10.2004)\r\n"
#define VERSTAG "\0$VER: net.lib 1.178 (7.10.2004)" #define VERSTAG "\0$VER: net.lib 1.179 (22.10.2004)"

View File

@ -1 +1 @@
178 179

View File

@ -1,6 +1,6 @@
#define VERSION 1 #define VERSION 1
#define REVISION 178 #define REVISION 179
#define DATE "7.10.2004" #define DATE "22.10.2004"
#define VERS "stack.lib 1.178" #define VERS "stack.lib 1.179"
#define VSTRING "stack.lib 1.178 (7.10.2004)\r\n" #define VSTRING "stack.lib 1.179 (22.10.2004)\r\n"
#define VERSTAG "\0$VER: stack.lib 1.178 (7.10.2004)" #define VERSTAG "\0$VER: stack.lib 1.179 (22.10.2004)"

View File

@ -1 +1 @@
178 179

View File

@ -1,5 +1,5 @@
/* /*
* $Id: stdio_vfscanf.c,v 1.2 2004-08-08 10:55:57 obarthel Exp $ * $Id: stdio_vfscanf.c,v 1.3 2004-10-22 10:57:53 obarthel Exp $
* *
* :ts=4 * :ts=4
* *
@ -1016,6 +1016,10 @@ __vfscanf(FILE *stream, const char *format, va_list arg)
} }
} }
/* Chose a base according to the conversion to be
expected. For the 'x' and 'i' we examine the
incoming data rather than commit ourselves to
a peculiar data format now. */
if(conversion_type == 'd' || conversion_type == 'u') if(conversion_type == 'd' || conversion_type == 'u')
base = 10; base = 10;
else if (conversion_type == 'o') else if (conversion_type == 'o')
@ -1060,7 +1064,11 @@ __vfscanf(FILE *stream, const char *format, va_list arg)
* '0x' prefix or just a zero. * '0x' prefix or just a zero.
*/ */
c = __getc(stream); c = __getc(stream);
if (c == 'x' || c == 'X')
/* This takes care of the '0x' prefix for hexadecimal
numbers ('%x') and also picks the right type of
data for the '%i' type. */
if ((c == 'x' || c == 'X') && (conversion_type == 'x' || conversion_type == 'i'))
{ {
/* It's the hex prefix. */ /* It's the hex prefix. */
base = 16; base = 16;
@ -1075,7 +1083,7 @@ __vfscanf(FILE *stream, const char *format, va_list arg)
if(maximum_field_width > 0) if(maximum_field_width > 0)
maximum_field_width--; maximum_field_width--;
} }
else if (isdigit(c)) else if (isdigit(c) && (conversion_type == 'i')) /* This could be the octal prefix for the '%i' format. */
{ {
/* The preceding '0' was part of the /* The preceding '0' was part of the
octal prefix. So we don't really know octal prefix. So we don't really know

View File

@ -1,6 +1,6 @@
#define VERSION 1 #define VERSION 1
#define REVISION 178 #define REVISION 179
#define DATE "7.10.2004" #define DATE "22.10.2004"
#define VERS "unix.lib 1.178" #define VERS "unix.lib 1.179"
#define VSTRING "unix.lib 1.178 (7.10.2004)\r\n" #define VSTRING "unix.lib 1.179 (22.10.2004)\r\n"
#define VERSTAG "\0$VER: unix.lib 1.178 (7.10.2004)" #define VERSTAG "\0$VER: unix.lib 1.179 (22.10.2004)"

View File

@ -1 +1 @@
178 179