mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-31 15:01:09 +00:00
Update.
2002-02-21 Jakub Jelinek <jakub@redhat.com> * libio/fileops.c (_IO_file_seekoff_mmap): Fix fseek SEEK_END. * stdio-common/tst-fseek.c (main): Add test for this.
This commit is contained in:
parent
15e260e8e0
commit
903b3396b8
@ -1,3 +1,8 @@
|
||||
2002-02-21 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
* libio/fileops.c (_IO_file_seekoff_mmap): Fix fseek SEEK_END.
|
||||
* stdio-common/tst-fseek.c (main): Add test for this.
|
||||
|
||||
2002-02-19 Ulrich Drepper <drepper@redhat.com.>
|
||||
|
||||
* stdlib/Versions: Move __on_exit to GLIBC_PRIVATE.
|
||||
|
@ -880,7 +880,7 @@ _IO_file_seekoff_mmap (fp, offset, dir, mode)
|
||||
case _IO_seek_set:
|
||||
break;
|
||||
case _IO_seek_end:
|
||||
offset = fp->_IO_read_end - fp->_IO_read_base + offset;
|
||||
offset += fp->_IO_buf_end - fp->_IO_buf_base;
|
||||
break;
|
||||
}
|
||||
/* At this point, dir==_IO_seek_set. */
|
||||
|
@ -419,6 +419,69 @@ main (void)
|
||||
result = 1;
|
||||
}
|
||||
|
||||
fclose (fp);
|
||||
|
||||
#ifdef USE_IN_LIBIO
|
||||
fp = fopen (fname, "r");
|
||||
if (fp == NULL)
|
||||
{
|
||||
puts ("fopen() failed\n");
|
||||
result = 1;
|
||||
}
|
||||
else if (fstat64 (fileno (fp), &st1) < 0)
|
||||
{
|
||||
puts ("fstat64() before fseeko() failed\n");
|
||||
result = 1;
|
||||
}
|
||||
else if (fseeko (fp, 0, SEEK_END) != 0)
|
||||
{
|
||||
puts ("fseeko(fp, 0, SEEK_END) failed");
|
||||
result = 1;
|
||||
}
|
||||
else if (ftello (fp) != st1.st_size)
|
||||
{
|
||||
printf ("fstat64 st_size %zd ftello %zd\n", st1.st_size,
|
||||
ftello (fp));
|
||||
result = 1;
|
||||
}
|
||||
else
|
||||
puts ("SEEK_END works");
|
||||
if (fp != NULL)
|
||||
fclose (fp);
|
||||
|
||||
fp = fopen (fname, "r");
|
||||
if (fp == NULL)
|
||||
{
|
||||
puts ("fopen() failed\n");
|
||||
result = 1;
|
||||
}
|
||||
else if (fstat64 (fileno (fp), &st1) < 0)
|
||||
{
|
||||
puts ("fstat64() before fgetc() failed\n");
|
||||
result = 1;
|
||||
}
|
||||
else if (fgetc (fp) == EOF)
|
||||
{
|
||||
puts ("fgetc() before fseeko() failed\n");
|
||||
result = 1;
|
||||
}
|
||||
else if (fseeko (fp, 0, SEEK_END) != 0)
|
||||
{
|
||||
puts ("fseeko(fp, 0, SEEK_END) failed");
|
||||
result = 1;
|
||||
}
|
||||
else if (ftello (fp) != st1.st_size)
|
||||
{
|
||||
printf ("fstat64 st_size %zd ftello %zd\n", st1.st_size,
|
||||
ftello (fp));
|
||||
result = 1;
|
||||
}
|
||||
else
|
||||
puts ("SEEK_END works");
|
||||
if (fp != NULL)
|
||||
fclose (fp);
|
||||
#endif
|
||||
|
||||
out:
|
||||
unlink (fname);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user