lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-28 00:21:52 +03:00
Code Activity

Update.

Browse Source 
* stdio-common/vfscanf.c: Fix reading (nil) for %p.
This commit is contained in:
Ulrich Drepper
1998-09-18 18:51:34 +00:00
parent 00bc5db059
commit c53a89d434
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -25,6 +25,8 @@
* time/strftime.c [_LIBC] (ampm): Use tp->tm_hour not hour12. * time/strftime.c [_LIBC] (ampm): Use tp->tm_hour not hour12.
* stdio-common/vfscanf.c: Fix reading (nil) for %p.
1998-09-18 Mark Kettenis <kettenis@phys.uva.nl> 1998-09-18 Mark Kettenis <kettenis@phys.uva.nl>
* login/programs/pt_chown.c (more_help): Correct message that * login/programs/pt_chown.c (more_help): Correct message that

35
stdio-common/vfscanf.c
View File

@ -216,6 +216,8 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
possibly be matched even if in the input stream no character is possibly be matched even if in the input stream no character is
available anymore. */ available anymore. */
int skip_space = 0; int skip_space = 0;
/* Nonzero if we are reading a pointer. */
int read_pointer;
/* Workspace. */ /* Workspace. */
char *tw; /* Temporary pointer. */ char *tw; /* Temporary pointer. */
char *wp = NULL; /* Workspace. */ char *wp = NULL; /* Workspace. */
@ -354,6 +356,9 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
/* This is the start of the conversion string. */ /* This is the start of the conversion string. */
flags = 0; flags = 0;
/* Not yet decided whether we read a pointer or not. */
read_pointer = 0;
/* Initialize state of modifiers. */ /* Initialize state of modifiers. */
argpos = 0; argpos = 0;
@ -871,13 +876,32 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
c = inchar (); c = inchar ();
} }
/* The just read character is not part of the number anymore. */
ungetc (c, s);
if (wpsize == 0 || if (wpsize == 0 ||
(wpsize == 1 && (wp[0] == '+' || wp[0] == '-'))) (wpsize == 1 && (wp[0] == '+' || wp[0] == '-')))
/* There was no number. */ {
conv_error (); /* There was no number. If we are supposed to read a pointer
we must recognize "(nil)" as well. */
if (wpsize == 0 && read_pointer && (width < 0 || width >= 0)
&& c == '('
&& tolower (inchar ()) == 'n'
&& tolower (inchar ()) == 'i'
&& tolower (inchar ()) == 'l'
&& inchar () == ')')
/* We must produce the value of a NULL pointer. A single
'0' digit is enough. */
ADDW ('0');
else
{
/* The last read character is not part of the number
anymore. */
ungetc (c, s);
conv_error ();
}
}
else
/* The just read character is not part of the number anymore. */
ungetc (c, s);
/* Convert the number. */ /* Convert the number. */
ADDW ('\0'); ADDW ('\0');
@ -1221,6 +1245,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
flags &= ~(SHORT|LONGDBL); flags &= ~(SHORT|LONGDBL);
flags |= LONG; flags |= LONG;
number_signed = 0; number_signed = 0;
read_pointer = 1;
goto number; goto number;
} }
} }