diff options
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/cleanup.c | 20 | ||||
| -rw-r--r-- | libio/fileops.c | 17 | ||||
| -rw-r--r-- | libio/ioprims.c | 73 |
3 files changed, 14 insertions, 96 deletions
diff --git a/libio/cleanup.c b/libio/cleanup.c deleted file mode 100644 index 4a068083d0..0000000000 --- a/libio/cleanup.c +++ /dev/null @@ -1,20 +0,0 @@ -#include "libioP.h" -#if _G_HAVE_ATEXIT -#include <stdlib.h> - -typedef void (*voidfunc) __P((void)); - -/* Prototype. */ -static void DEFUN_VOID (_IO_register_cleanup); - -static void -DEFUN_VOID(_IO_register_cleanup) -{ - atexit ((voidfunc)_IO_cleanup); - _IO_cleanup_registration_needed = 0; -} - -void (*_IO_cleanup_registration_needed) __P((void)) = _IO_register_cleanup; -#else -void (*_IO_cleanup_registration_needed) __P((void)) = NULL; -#endif /* _G_HAVE_ATEXIT */ 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. */ diff --git a/libio/ioprims.c b/libio/ioprims.c deleted file mode 100644 index d17c10a168..0000000000 --- a/libio/ioprims.c +++ /dev/null @@ -1,73 +0,0 @@ -/* -Copyright (C) 1993 Free Software Foundation - -This file is part of the GNU IO Library. This library is free -software; you can redistribute it and/or modify it under the -terms of the GNU General Public License as published by the -Free Software Foundation; either version 2, or (at your option) -any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU CC; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - -As a special exception, if you link this library with files -compiled with a GNU compiler to produce an executable, this does not cause -the resulting executable to be covered by the GNU General Public License. -This exception does not however invalidate any other reasons why -the executable file might be covered by the GNU General Public License. */ - -/* I/O OS-level primitives. - Needs to be replaced if not using Unix. - Also needs to be replaced if avoiding name-space pollution - (in which case read would be defined in terms of _IO_read, - rather than vice versa). */ - -#include "libioP.h" -#include <unistd.h> -#include <sys/types.h> -#include <sys/stat.h> - -#ifdef TODO -/* Add open, isatty */ -#endif - -_IO_ssize_t -DEFUN(_IO_read, (fildes, buf, nbyte), - int fildes AND void *buf AND _IO_size_t nbyte) -{ - return __read (fildes, buf, nbyte); -} - -_IO_ssize_t -DEFUN(_IO_write, (fildes, buf, nbyte), - int fildes AND const void *buf AND _IO_size_t nbyte) -{ - return __write (fildes, buf, nbyte); -} - -_IO_off_t -DEFUN(_IO_lseek, (fildes, offset, whence), - int fildes AND _IO_off_t offset AND int whence) -{ - return __lseek (fildes, offset, whence); -} - -int -DEFUN(_IO_close, (fildes), - int fildes) -{ - return __close (fildes); -} - -int -DEFUN(_IO_fstat, (fildes, buf), - int fildes AND struct stat *buf) -{ - return __fstat (fildes, buf); -} |