picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

* libio/fileops.c (_IO_file_seekoff_mmap): When just examining the

Browse source 
position, calculate it to take into account an active pushback buffer.

	* libio/Makefile (tests): Add bug-ungetc.
	* libio/bug-ungetc.c: New file.
This commit is contained in:
Roland McGrath 2002-07-24 09:35:24 +00:00
parent 0e94c2176b
commit 7e93f91553
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2002-07-24 Roland McGrath <roland@frob.com>
* libio/fileops.c (_IO_file_seekoff_mmap): When just examining the
position, calculate it to take into account an active pushback buffer.
* libio/Makefile (tests): Add bug-ungetc.
* libio/bug-ungetc.c: New file.
2002-07-23 Ulrich Drepper <drepper@redhat.com>
* sysdeps/generic/libc-tls.c: New file.

10
libio/fileops.c
View file

@ -922,8 +922,12 @@ _IO_file_seekoff_mmap (fp, offset, dir, mode)
{
_IO_off64_t result;
/* If we are only interested in the current position, calculate it and
return right now. This calculation does the right thing when we are
using a pushback buffer, but in the usual case has the same value as
(fp->_IO_read_ptr - fp->_IO_buf_base). */
if (mode == 0)
dir = _IO_seek_cur, offset = 0; /* Don't move any pointers. */
return fp->_offset - (fp->_IO_read_end - fp->_IO_read_ptr);
switch (dir)
{
@ -943,10 +947,6 @@ _IO_file_seekoff_mmap (fp, offset, dir, mode)
/* No negative offsets are valid. */
return EOF;
/* If we are only interested in the current position we've found it now. */
if (mode == 0)
return offset;
result = _IO_SYSSEEK (fp, offset, 0);
if (result < 0)
return EOF;