From d762684b511b6a425d9e0e2ff7473ffbfc98687d Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 20 Aug 1998 20:14:21 +0000 Subject: Update. 1998-08-20 20:07 Ulrich Drepper * pwd/getpw.c (__getpw): Use %lu for uid and gid parameter and cast them to unsigned long int. * pwd/putpwent.c (putpwent): Likewise. Patch by John Tobey . 1998-08-20 17:14 H.J. Lu * libio/libioP.h (FILEBUF_LITERAL): Set the _offset field to _IO_pos_BAD. 1998-02-20 17:54 H.J. Lu * libio/fileops.c (_IO_file_seekoff): Don't adjust pointers if _IO_SYSSEEK fails. * sysdeps/unix/sysv/linux/Makefile [subdirs=misc] (sysdep_headers): Add sys/sendfile.h. * sysdeps/unix/sysv/linux/syscalls.list: Add sendfile. * sysdeps/unix/sysv/linux/sys/sendfile.h: New file. * sysdeps/unix/sysv/linux/sys/acct.h: Pretty print. * sysdeps/unix/sysv/linux/Versions [GLIBC_2.1]: Add umount2 and sendfile. --- libio/fileops.c | 10 ++++++---- libio/libioP.h | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'libio') diff --git a/libio/fileops.c b/libio/fileops.c index 596d97078a..5a5f9d9db2 100644 --- a/libio/fileops.c +++ b/libio/fileops.c @@ -613,10 +613,12 @@ _IO_file_seekoff (fp, offset, dir, mode) _IO_unsave_markers (fp); result = _IO_SYSSEEK (fp, offset, dir); if (result != EOF) - _IO_mask_flags (fp, 0, _IO_EOF_SEEN); - fp->_offset = result; - _IO_setg (fp, fp->_IO_buf_base, fp->_IO_buf_base, fp->_IO_buf_base); - _IO_setp (fp, fp->_IO_buf_base, fp->_IO_buf_base); + { + _IO_mask_flags (fp, 0, _IO_EOF_SEEN); + fp->_offset = result; + _IO_setg (fp, fp->_IO_buf_base, fp->_IO_buf_base, fp->_IO_buf_base); + _IO_setp (fp, fp->_IO_buf_base, fp->_IO_buf_base); + } return result; } diff --git a/libio/libioP.h b/libio/libioP.h index 84bac2c719..4891294726 100644 --- a/libio/libioP.h +++ b/libio/libioP.h @@ -555,12 +555,12 @@ extern int _IO_vscanf __P ((const char *, _IO_va_list)); # define FILEBUF_LITERAL(CHAIN, FLAGS, FD) \ { _IO_MAGIC+_IO_LINKED+_IO_IS_FILEBUF+FLAGS, \ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, CHAIN, FD, \ - 0, 0, 0, 0, { 0 }, &_IO_stdfile_##FD##_lock } + 0, _IO_pos_BAD, 0, 0, { 0 }, &_IO_stdfile_##FD##_lock } #else /* check following! */ # define FILEBUF_LITERAL(CHAIN, FLAGS, FD) \ { _IO_MAGIC+_IO_LINKED+_IO_IS_FILEBUF+FLAGS, \ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, CHAIN, FD } + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, CHAIN, FD, 0, _IO_pos_BAD } #endif /* VTABLE_LABEL defines NAME as of the CLASS class. -- cgit 1.4.1