qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
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.
This commit is contained in:
Roland McGrath 1995-12-23 01:14:10 +00:00
parent 975320984b
commit 2114e10acb
6 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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 * sysdeps/mach/hurd/fork.c: Peek __mach_task_self_ value before
proc_dostop call to work around kernel paging bug. 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> 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 * sysdeps/mach/hurd/setuid.c (__setuid): Actually add the new uid

2
stdio-common/Makefile
View File

@ -39,7 +39,7 @@ distribute := _itoa.h printf-parse.h
tests := tst-printf tstscanf test_rdwr test-popen tstgetln test-fseek \ tests := tst-printf tstscanf test_rdwr test-popen tstgetln test-fseek \
temptest tst-fileno test-fwrite \ temptest tst-fileno test-fwrite \
xbug errnobug \ 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 tfformat tiformat tstdiomisc

13
stdio-common/bug11.c Normal file
View File

@ -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;
}

7
stdio-common/vfscanf.c
View File

@ -233,9 +233,8 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
if (c == EOF) if (c == EOF)
input_error (); input_error ();
/* We saw an white space as the last character in the format /* We saw white space char as the last character in the format
string. Now it's time to skip all leading white string. Now it's time to skip all leading white space. */
spaces. */
if (skip_space) if (skip_space)
{ {
while (isspace (c)) while (isspace (c))
@ -243,7 +242,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
skip_space = 0; skip_space = 0;
} }
else if (c == fc) if (c == fc)
(void) inchar (); (void) inchar ();
else else
conv_error (); conv_error ();

2
sysdeps/mach/hurd/setgid.c
View File

@ -66,7 +66,7 @@ DEFUN(__setgid, (gid), gid_t gid)
newaux = auxbuf; newaux = auxbuf;
naux = 2; naux = 2;
} }
_hurd_id.aux.gids[0] = _hurd_id.aux.gids[1] = gid; newaux[0] = newaux[1] = gid;
} }
else else
{ {

2
sysdeps/mach/hurd/setuid.c
View File

@ -66,7 +66,7 @@ DEFUN(__setuid, (uid), uid_t uid)
newaux = auxbuf; newaux = auxbuf;
naux = 2; naux = 2;
} }
_hurd_id.aux.uids[0] = _hurd_id.aux.uids[1] = uid; newaux[0] = newaux[1] = uid;
} }
else else
{ {