AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 12:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[BZ #4745]

Browse Source 
2007-07-07  Ulrich Drepper  <drepper@redhat.com>
	[BZ #4745]
	* libio/strops.c (_IO_str_underflow): Clear errno before returning
	EOF.
	* stdio-common/Makefile (tests): Add bug18.
	* stdio-common/bug18.c: New file.
This commit is contained in:
Ulrich Drepper 2007-07-07 18:29:30 +00:00
parent 765c6b0c46
commit c2c7bd3f86
4 changed files with 58 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2007-07-07 Ulrich Drepper <drepper@redhat.com>
[BZ #4745]
* libio/strops.c (_IO_str_underflow): Clear errno before returning
EOF.
* stdio-common/Makefile (tests): Add bug18.
* stdio-common/bug18.c: New file.
2007-07-05 Mike Frysinger <vapier@gentoo.org>
* Makeconfig ($(common-objpfx)gnu/lib-names.stmp): Use LC_ALL=C when

9
libio/strops.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1993, 1997-2003, 2004, 2006 Free Software Foundation, Inc.
/* Copyright (C) 1993, 1997-2004, 2006, 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -166,7 +166,12 @@ _IO_str_underflow (fp)
if (fp->_IO_read_ptr < fp->_IO_read_end)
return *((unsigned char *) fp->_IO_read_ptr);
else
return EOF;
{
/* We have to reset errno since callers check for errno being
EINTR and there has been no such problem here. */
__set_errno (0);
return EOF;
}
}
INTDEF(_IO_str_underflow)

2
stdio-common/Makefile
View File

@ -54,7 +54,7 @@ tests := tstscanf test_rdwr test-popen tstgetln test-fseek \
tst-swprintf tst-fseek tst-fmemopen test-vfprintf tst-gets \
tst-perror tst-sprintf tst-rndseek tst-fdopen tst-fphex bug14 bug15 \
tst-popen tst-unlockedio tst-fmemopen2 tst-put-error tst-fgets \
tst-fwrite bug16 bug17 tst-swscanf tst-sprintf2
tst-fwrite bug16 bug17 tst-swscanf tst-sprintf2 bug18
test-srcs = tst-unbputc tst-printf

42
stdio-common/bug18.c Normal file
View File

@ -0,0 +1,42 @@
#include <assert.h>
#include <errno.h>
#include <stdio.h>
static int
do_test (void)
{
printf("setting errno to EINTR\n");
errno = EINTR;
printf("checking sscanf\n");
char str[] = "7-11";
int i, j, n;
i = j = n = 0;
sscanf (str, " %i - %i %n", &i, &j, &n);
printf ("found %i-%i (length=%i)\n", i, j, n);
int result = 0;
if (i != 7)
{
printf ("i is %d, expected 7\n", i);
result = 1;
}
if (j != 11)
{
printf ("j is %d, expected 11\n", j);
result = 1;
}
if (n != 4)
{
printf ("n is %d, expected 4\n", j);
result = 1;
}
return result;
}
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"