diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-04-20 04:28:00 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-04-20 04:28:00 +0000 |
| commit | d3b520289178bbe9c252c0a2784a529b89951945 (patch) | |
| tree | bbfda740b0fc0d4c64d817f7a24eb4be8ff269a5 /stdio-common/vfscanf.c | |
| parent | a5dd0a6caf0a45a945dadaa48a831e2215351e61 (diff) | |
| download | glibc-d3b520289178bbe9c252c0a2784a529b89951945.tar.gz | |
Update.
2004-04-20 Jakub Jelinek <jakub@redhat.com>
* stdio-common/vfscanf.c (_IO_vfscanf): When skipping whitespace,
do input_error () instead of conv_error () and don't look at errno.
Don't eat any whitespace before %% if skip_space == 0.
* stdio-common/tst-sscanf.c (int_tests): New array.
(main): Run int_tests.
See ChangeLog.14 for earlier changes.
Diffstat (limited to 'stdio-common/vfscanf.c')
| -rw-r--r-- | stdio-common/vfscanf.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c index ac6fcdf79f..551849b115 100644 --- a/stdio-common/vfscanf.c +++ b/stdio-common/vfscanf.c @@ -396,8 +396,8 @@ _IO_vfscanf (s, format, argptr, errp) if (skip_space) { while (ISSPACE (c)) - if (inchar () == EOF && errno == EINTR) - conv_error (); + if (inchar () == EOF) + input_error (); skip_space = 0; } @@ -543,7 +543,8 @@ _IO_vfscanf (s, format, argptr, errp) /* Find the conversion specifier. */ fc = *f++; if (skip_space || (fc != L_('[') && fc != L_('c') - && fc != L_('C') && fc != L_('n'))) + && fc != L_('C') && fc != L_('n') + && fc != L_('%'))) { /* Eat whitespace. */ int save_errno = errno; |