diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1996-12-09 03:15:25 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1996-12-09 03:15:25 +0000 |
| commit | feb3c934355a9a2331cdfeb7ab6351fd4856164f (patch) | |
| tree | c471eb93237700d90a63c8448e8b99a2ecb23dd0 /libio/fileops.c | |
| parent | f65fd747b440ae2d8a7481ecc50e668c5e4d0cc9 (diff) | |
update from main archive 961208cvs/libc-961209
Mon Dec 9 03:39:30 1996 Ulrich Drepper <drepper@cygnus.com>
* config.make.in (defines): Add @USE_NEW_MALLOC@.
* Makefile.in: Define USE_NEW_MALLOC to -DUSE_NEW_MALLOC if
we use the new malloc.
* malloc.h: Use either <malloc/malloc.h> or <new-malloc/malloc.h>
depending on USE_NEW_MALLOC.
Fix some more POSIX.1 problems.
* libio/fileops.c (_IO_file_underflow): Set errno to EBADF if used
on a write-only stream.
(_IO_file_overflow): Set errno to EBADF if used on a read-only
stream.
(_IO_file_seekoff): POSIX.1 requires that fseek() after an fflush()
call really positions the file offset to the correct position
and no read-ahead happens.
* locale/C-monetary.c: Set mon_grouping file to "" and "\377"
to pass POSIX test suite.
* stdio-common/vfprintf.c: Handle empty string as grouping command
correctly.
* stdlib/grouping.h: Likewise.
* misc/syslog.c: Case first argument of __libc_cleanup_region_start.
* signal/sigsetops.h: Update copyright. Don't include ansidecl.h.
* stdio-common/printf_fp.c: Update copyright.
Sun Dec 8 16:39:28 1996 Andreas Jaeger <aj@arthur.pfalz.de>
* time/Makefile: Compile ap.c with NO_MCHECK flag if new-malloc
used (not otherwise).
* misc/syslog.c (vsyslog): Cast argument to __libc_cleanup_region
to get Hurd macros right.
Diffstat (limited to 'libio/fileops.c')
| -rw-r--r-- | libio/fileops.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/libio/fileops.c b/libio/fileops.c index ce0e2bb524..b5026e167a 100644 --- a/libio/fileops.c +++ b/libio/fileops.c @@ -269,7 +269,10 @@ DEFUN(_IO_file_underflow, (fp), #endif if (fp->_flags & _IO_NO_READS) - return EOF; + { + __set_errno (EBADF); + return EOF; + } if (fp->_IO_read_ptr < fp->_IO_read_end) return *(unsigned char*)fp->_IO_read_ptr; @@ -308,7 +311,10 @@ DEFUN(_IO_file_overflow, (f, ch), register _IO_FILE* f AND int ch) { if (f->_flags & _IO_NO_WRITES) /* SET ERROR */ - return EOF; + { + __set_errno (EBADF); + return EOF; + } /* If currently reading or no buffer allocated. */ if ((f->_flags & _IO_CURRENTLY_PUTTING) == 0) { @@ -387,6 +393,10 @@ DEFUN(_IO_file_seekoff, (fp, offset, dir, mode), _IO_pos_t result; _IO_off_t delta, new_offset; long count; + /* POSIX.1 8.2.3.7 says that after a call the fflush() the file + offset of the underlying file must be exact. */ + int must_be_exact = (fp->_IO_read_base == fp->_IO_read_end + && fp->_IO_write_base == fp->_IO_write_ptr); if (mode == 0) dir = _IO_seek_cur, offset = 0; /* Don't move any pointers. */ @@ -503,7 +513,8 @@ DEFUN(_IO_file_seekoff, (fp, offset, dir, mode), else { count = _IO_SYSREAD (fp, fp->_IO_buf_base, - fp->_IO_buf_end - fp->_IO_buf_base); + (must_be_exact + ? delta : fp->_IO_buf_end - fp->_IO_buf_base)); if (count < delta) { /* We weren't allowed to read, but try to seek the remainder. */ |