diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | stdio-common/Makefile | 2 | ||||
| -rw-r--r-- | stdio-common/bug11.c | 13 | ||||
| -rw-r--r-- | stdio-common/vfscanf.c | 7 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/setgid.c | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/setuid.c | 2 |
6 files changed, 25 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index d2b8241a70..53669d2396 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,12 @@ Fri Dec 22 00:57:38 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> * sysdeps/mach/hurd/fork.c: Peek __mach_task_self_ value before proc_dostop call to work around kernel paging bug. +Fri Dec 22 00:38:00 1995 H.J. Lu <hjl@nynexst.com> + + * stdio-common/vfscanf.c: Correctly handle white space skipping. + * stdio-common/Makefile (tests): Add bug11. + * stdio-common/bug11.c: New file. + Thu Dec 21 12:19:32 1995 Miles Bader <miles@gnu.ai.mit.edu> * sysdeps/mach/hurd/setuid.c (__setuid): Actually add the new uid diff --git a/stdio-common/Makefile b/stdio-common/Makefile index a718db6a2c..d8cd8af749 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -39,7 +39,7 @@ distribute := _itoa.h printf-parse.h tests := tst-printf tstscanf test_rdwr test-popen tstgetln test-fseek \ temptest tst-fileno test-fwrite \ xbug errnobug \ - bug1 bug2 bug3 bug4 bug5 bug6 bug7 bug8 bug9 bug10 \ + bug1 bug2 bug3 bug4 bug5 bug6 bug7 bug8 bug9 bug10 bug11 \ tfformat tiformat tstdiomisc diff --git a/stdio-common/bug11.c b/stdio-common/bug11.c new file mode 100644 index 0000000000..1f5739cb7d --- /dev/null +++ b/stdio-common/bug11.c @@ -0,0 +1,13 @@ +#include <stdio.h> +#include <string.h> + +main () +{ + int ret; + char buf [1024] = "Ooops"; + + ret = sscanf ("static char Term_bits[] = {", "static char %s = {", buf); + printf ("ret: %d, name: %s\n", ret, buf); + + return strcmp (buf, "Term_bits[]") != 0 || ret != 1; +} diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c index df68260cdd..14aa7d9748 100644 --- a/stdio-common/vfscanf.c +++ b/stdio-common/vfscanf.c @@ -233,9 +233,8 @@ __vfscanf (FILE *s, const char *format, va_list argptr) if (c == EOF) input_error (); - /* We saw an white space as the last character in the format - string. Now it's time to skip all leading white - spaces. */ + /* We saw white space char as the last character in the format + string. Now it's time to skip all leading white space. */ if (skip_space) { while (isspace (c)) @@ -243,7 +242,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr) skip_space = 0; } - else if (c == fc) + if (c == fc) (void) inchar (); else conv_error (); diff --git a/sysdeps/mach/hurd/setgid.c b/sysdeps/mach/hurd/setgid.c index 660a3fe5d0..b2d9313307 100644 --- a/sysdeps/mach/hurd/setgid.c +++ b/sysdeps/mach/hurd/setgid.c @@ -66,7 +66,7 @@ DEFUN(__setgid, (gid), gid_t gid) newaux = auxbuf; naux = 2; } - _hurd_id.aux.gids[0] = _hurd_id.aux.gids[1] = gid; + newaux[0] = newaux[1] = gid; } else { diff --git a/sysdeps/mach/hurd/setuid.c b/sysdeps/mach/hurd/setuid.c index 586ad2154f..c2491d6d13 100644 --- a/sysdeps/mach/hurd/setuid.c +++ b/sysdeps/mach/hurd/setuid.c @@ -66,7 +66,7 @@ DEFUN(__setuid, (uid), uid_t uid) newaux = auxbuf; naux = 2; } - _hurd_id.aux.uids[0] = _hurd_id.aux.uids[1] = uid; + newaux[0] = newaux[1] = uid; } else { |