OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update. 

2004-11-04  Jakub Jelinek  <jakub@redhat.com>

	* libio/fileops.c (_IO_new_file_seekoff): If mode is 0 and
	fp->_offset == _IO_pos_BAD, just call _IO_SYSSEEK (fp, 0, dir)
	and if successful set fp->_offset.
	* libio/Makefile (tests): Add bug-ungetc3.
	* libio/bug-ungetc3.c: New test.
This commit is contained in:
Ulrich Drepper 2004-11-09 07:05:27 +00:00
parent eca29725d1
commit 51cd2fbfb8
3 changed files with 103 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2004-11-04 Jakub Jelinek <jakub@redhat.com>
* libio/fileops.c (_IO_new_file_seekoff): If mode is 0 and
fp->_offset == _IO_pos_BAD, just call _IO_SYSSEEK (fp, 0, dir)
and if successful set fp->_offset.
* libio/Makefile (tests): Add bug-ungetc3.
* libio/bug-ungetc3.c: New test.
2004-11-03 Marcus Brinkmann <marcus@gnu.org>
* sysdeps/gnu/_G_config.h (_G_HAVE_MREMAP): Define symbol.

2
libio/Makefile
View File

@ -54,7 +54,7 @@ tests = tst_swprintf tst_wprintf tst_swscanf tst_wscanf tst_getwc tst_putwc \
tst-freopen bug-rewind bug-rewind2 bug-ungetc bug-fseek \
tst-mmap-eofsync tst-mmap-fflushsync bug-mmap-fflush \
tst-mmap2-eofsync tst-mmap-offend bug-fopena+ bug-wfflush \
bug-ungetc2 bug-ftell
bug-ungetc2 bug-ftell bug-ungetc3
test-srcs = test-freopen
all: # Make this the default target; it will be defined in Rules.

94
libio/bug-ungetc3.c Normal file
View File

@ -0,0 +1,94 @@
/* Test program for ungetc/ftell interaction bug. */
#include <stdio.h>
static void do_prepare (void);
#define PREPARE(argc, argv) do_prepare ()
static int do_test (void);
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"
static const char pattern[] = "12345";
static char *temp_file;
static void
do_prepare (void)
{
int fd = create_temp_file ("bug-ungetc.", &temp_file);
if (fd == -1)
{
printf ("cannot create temporary file: %m\n");
exit (1);
}
write (fd, pattern, sizeof (pattern));
close (fd);
}
static int
do_one_test (int mode)
{
FILE *f;
f = fopen (temp_file, "r");
if (f == NULL)
{
printf ("could not open temporary file: %m\n");
return 1;
}
if (mode == 1 && ftell (f) != 0)
{
printf ("first ftell returned wrong position %ld\n", ftell (f));
return 1;
}
if (fgetc (f) != '1' || fgetc (f) != '2')
{
puts ("fgetc failed");
return 1;
}
if (mode == 2 && ftell (f) != 2)
{
printf ("second ftell returned wrong position %ld\n", ftell (f));
return 1;
}
if (ungetc ('6', f) != '6')
{
puts ("ungetc failed");
return 1;
}
if (ftell (f) != 1)
{
printf ("third ftell returned wrong position %ld\n", ftell (f));
return 1;
}
if (fgetc (f) != '6')
{
puts ("fgetc failed");
return 1;
}
if (ftell (f) != 2)
{
printf ("fourth ftell returned wrong position %ld\n", ftell (f));
return 1;
}
fclose (f);
return 0;
}
static int
do_test (void)
{
int mode;
for (mode = 0; mode <= 2; mode++)
if (do_one_test (mode))
return 1;
return 0;
}