diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-04-20 18:58:56 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-04-20 18:58:56 +0000 |
| commit | f9a06dc1b5f83ddd6448c6bf80dfe9e02eb97a3d (patch) | |
| tree | 0293530bb5e96f892765635e2a52c0ba5bd54d3b /stdio-common | |
| parent | af1ff65986677e1ee29b6adc2750163c64b5aaef (diff) | |
| download | glibc-f9a06dc1b5f83ddd6448c6bf80dfe9e02eb97a3d.tar.gz glibc-f9a06dc1b5f83ddd6448c6bf80dfe9e02eb97a3d.tar.xz glibc-f9a06dc1b5f83ddd6448c6bf80dfe9e02eb97a3d.zip | |
Update.
2004-04-20 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/shm_open.c (shm_unlink): Change EPERM into EACCES. 2004-04-20 Jakub Jelinek <jakub@redhat.com> * stdio-common/vfscanf.c (_IO_vfscanf): Revert last %% whitespace handling change. * stdio-common/tst-sscanf.c (int_tests): Adjust. * nis/nss-nis.c: Include stdlib.h. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Shut up a warning. * sysdeps/sparc/sparc64/memcmp.S (memcmp): Remove BP_SYM () from libc_hidden_builtin_def. 2004-04-20 Jim Meyering <jim@meyering.net> * misc/error.c (error_tail): Don't leak upon realloc failure. 2004-04-20 Martin Schwidefsky <schwidefsky@de.ibm.com> * sysdeps/unix/sysv/linux/dl-execstack.c (_dl_make_stack_executable): Use RETURN_ADDRESS instead of __builtin_return_address.
Diffstat (limited to 'stdio-common')
| -rw-r--r-- | stdio-common/tst-sscanf.c | 5 | ||||
| -rw-r--r-- | stdio-common/vfscanf.c | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/stdio-common/tst-sscanf.c b/stdio-common/tst-sscanf.c index 3bd7c35832..e710e190d7 100644 --- a/stdio-common/tst-sscanf.c +++ b/stdio-common/tst-sscanf.c @@ -78,7 +78,6 @@ struct int_test { "foo\t", "foo bar", -1 }, { "foo\t", "foo %d", -1 }, { "foo\t", "foo\t%d", -1 }, - { "foo \t %bar1", "foo%%bar%d", 0 }, { "foo", "foo", 0 }, { "foon", "foo bar", 0 }, { "foon", "foo %d", 0 }, @@ -89,7 +88,9 @@ struct int_test { "foo bar", "foo %d", 0 }, { "foo bar", "foon%d", 0 }, { "foo ", "foo %n", 0 }, - { "foo%bar1", "foo%%bar%d", 1 } + { "foo%bar1", "foo%%bar%d", 1 }, + /* Some OSes skip whitespace here while others don't. */ + { "foo \t %bar1", "foo%%bar%d", 1 } }; int diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c index 551849b115..63e7bd8815 100644 --- a/stdio-common/vfscanf.c +++ b/stdio-common/vfscanf.c @@ -543,8 +543,7 @@ _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_('%'))) + && fc != L_('C') && fc != L_('n'))) { /* Eat whitespace. */ int save_errno = errno; |