diff options
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/Makefile | 2 | ||||
| -rw-r--r-- | libio/Versions | 2 | ||||
| -rw-r--r-- | libio/iofread_u.c | 42 | ||||
| -rw-r--r-- | libio/iofwrite.c | 6 | ||||
| -rw-r--r-- | libio/iofwrite_u.c | 47 |
5 files changed, 94 insertions, 5 deletions
diff --git a/libio/Makefile b/libio/Makefile index 61bd54f400..3c75183987 100644 --- a/libio/Makefile +++ b/libio/Makefile @@ -34,7 +34,7 @@ routines := \ clearerr feof ferror fgetc fileno fputc freopen fseek getc getchar \ memstream pclose putc putchar rewind setbuf setlinebuf vasprintf \ iovdprintf vscanf vsnprintf obprintf fcloseall fseeko ftello \ - freopen64 fseeko64 ftello64 \ + freopen64 fseeko64 ftello64 iofread_u iofwrite_u \ \ libc_fatal diff --git a/libio/Versions b/libio/Versions index ea58a29321..12277ae29f 100644 --- a/libio/Versions +++ b/libio/Versions @@ -98,6 +98,6 @@ libc { # f* fgetpos64; fopen64; freopen64; fseeko; fseeko64; fsetpos64; ftello; - ftello64; fopen; fclose; fdopen; + ftello64; fopen; fclose; fdopen; fread_unlocked; fwrite_unlocked; } } diff --git a/libio/iofread_u.c b/libio/iofread_u.c new file mode 100644 index 0000000000..bd7ceaf379 --- /dev/null +++ b/libio/iofread_u.c @@ -0,0 +1,42 @@ +/* Copyright (C) 1993, 1995, 1997, 1998 Free Software Foundation, Inc. + 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 this library; see the file COPYING. If not, write to + the Free Software Foundation, 59 Temple Place - Suite 330, Boston, + MA 02111-1307, 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. */ + +#include "libioP.h" + +_IO_size_t +fread_unlocked (buf, size, count, fp) + void *buf; + _IO_size_t size; + _IO_size_t count; + _IO_FILE *fp; +{ + _IO_size_t bytes_requested = size*count; + _IO_size_t bytes_read; + CHECK_FILE (fp, 0); + if (bytes_requested == 0) + return 0; + bytes_read = _IO_sgetn (fp, (char *) buf, bytes_requested); + return bytes_requested == bytes_read ? count : bytes_read / size; +} diff --git a/libio/iofwrite.c b/libio/iofwrite.c index 0f82797ecf..d163d29361 100644 --- a/libio/iofwrite.c +++ b/libio/iofwrite.c @@ -35,15 +35,15 @@ _IO_fwrite (buf, size, count, fp) _IO_size_t request = size * count; _IO_size_t written; CHECK_FILE (fp, 0); + /* Many traditional implementations return 0 if size==0 && count > 0, + but ANSI requires us to return count in this case. */ if (request == 0) - return 0; + return count; _IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp); _IO_flockfile (fp); written = _IO_sputn (fp, (const char *) buf, request); _IO_funlockfile (fp); _IO_cleanup_region_end (0); - /* Many traditional implementations return 0 if size==0 && count > 0, - but ANSI requires us to return count in this case. */ if (written == request) return count; else diff --git a/libio/iofwrite_u.c b/libio/iofwrite_u.c new file mode 100644 index 0000000000..7d1d24b758 --- /dev/null +++ b/libio/iofwrite_u.c @@ -0,0 +1,47 @@ +/* Copyright (C) 1993, 1996, 1997, 1998 Free Software Foundation, Inc. + 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 this library; see the file COPYING. If not, write to + the Free Software Foundation, 59 Temple Place - Suite 330, Boston, + MA 02111-1307, 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. */ + +#include "libioP.h" + +_IO_size_t +fwrite_unlocked (buf, size, count, fp) + const void *buf; + _IO_size_t size; + _IO_size_t count; + _IO_FILE *fp; +{ + _IO_size_t request = size * count; + _IO_size_t written; + CHECK_FILE (fp, 0); + /* Many traditional implementations return 0 if size==0 && count > 0, + but ANSI requires us to return count in this case. */ + if (request == 0) + return count; + written = _IO_sputn (fp, (const char *) buf, request); + if (written == request) + return count; + else + return written / size; +} |