mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-25 06:20:06 +00:00
e918a7feeb
1998-07-09 13:34 Ulrich Drepper <drepper@cygnus.com> * grp/grp.h: Define gid_t also for __USE_XOPEN. * io/fcntl.h: Include <sys/stat.h> also for __USE_XOPEN. * io/utime.h: Define time_t also for __USE_XOPEN. * io/sys/stat.h: Define time_t also for __USE_XOPEN. Define *_t types except for pid_t also for __USE_XOPEN. Define S_* macros also for __USE_XOPEN. * locale/langinfo.h: Define CODESET, CRNCYSTR, RADIXCHAR, and THOUSEP also for __USE_XOPEN. * math/math.c: Define M_* macros also for __USE_XOPEN. * math/bits/mathcalls.h: Declare hypot also for __USE_XOPEN. * posix/fnmatch.h: Define FNM_NOSYS and for if _XOPEN_SOURCE is defined. * posix/glob.h: Likewise for GLOB_NOSYS. * posix/regex.h: Likewise for REG_NOSYS. * posix/wordexp.h: Likewise for WRDE_NOSYS. * posix/unistd.h: Define *_t types also for __USE_XOPEN. * posix/sys/wait.h: Define pid_t for __USE_XOPEN. * pwd/pwd.h: Define gid_t and pid_t also for __USE_XOPEN. * signal/signal.h: Define pid_t also fir __USE_XOPEN. * sysdeps/unix/sysv/linux/bits/fcntl.h: Define _RSYNC and O_DSYNC also for __USE_POSIX199309. * sysdeps/unix/sysv/linux/bits/termios.h: Define the various B* constants also for __USE_XOPEN. * wcsmbs/wchar.h: For XPG4 include wctype.h. * intl/dcgettext.c (find_msg): Initialize act to prevent warning. * locale/setlocale.c (new_composite_name): Likewise for last_len. * libio/stdio.h: Don't declare fclose_unlocked. * sysdeps/posix/fpathconf.c: Handle _PC_FILESIZEBITS. 1998-07-08 Mark Kettenis <kettenis@phys.uva.nl> * stdio/stdio.h: Add prototypes for fflush_unlocked, getc_unlocked, getchar_unlocked, putc_unlocked, putchar_unlocked, fgets_unlocked, fread_unlocked, fwrite_unlocked, clearerr_unlocked, feof_unlocked, ferror_unlocked, fileno_unlocked, flockfile, ftrylockfile, funlockfile. [__USE_XOPEN && !__USE_GNU] Declare optarg, optind, opterr. Add prototype for getopt. * stdio/clearerr.c (clearerr_unlocked): Weak alias for clearerr. * stdio/feof.c (feof_unlocked): Weak alias for feof. * stdio/ferror.c (ferror_unlocked): Weak alias for ferror. * stdio/fflush.c (fflush_unlocked): Weak alias for fflush. * stdio/fgets.c (fgets_unlocked): Weak alias for fgets. * stdio/fileno.c (fileno_unlocked): Weak alias for fileno. * stdio/fputc.c (fputc_unlocked): Weak alias for fputc. * stdio/fread.c (fread_unlocked): Weak alias for fread. * stdio/fwrite.c (fwrite_unlocked): Weak alias for fwrite. * stdio/getc.c (getchar_unlocked): Weak alias for getc. * stdio/getchar.c (getchar_unlocked): Weak alias for getchar. * stdio/putc.c (putc_unlocked): Weak alias for putc. * stdio/putchar.c (putchar_unlocked): Weak alias for putchar. * stdio/Versions [GLIBC_2.1]: Add clearerr_unlocked, feof_unlocked, ferror_unlocked, fflush_unlocked, fgets_unlocked, fileno_unlocked, fputc_unlocked, fread_unlocked, fwrite_unlocked, getc_unlocked, getchar_unlocked, putc_unlocked and putchar_unlocked. * libio/Versions: Move flockfile, ftrylockfile and funlockfile from here ... * stdio-common/Versions: ... to here. 1998-07-09 Andreas Jaeger <aj@arthur.rhein-neckar.de> * Makerules (versioning): Correct typo.
136 lines
3.5 KiB
C
136 lines
3.5 KiB
C
/* Copyright (C) 1991, 92, 95, 96, 97, 98 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
|
|
#define default_func __default_room_functions.__input
|
|
|
|
/* Read NMEMB chunks of SIZE bytes each from STREAM into P. */
|
|
size_t
|
|
fread (p, size, nmemb, stream)
|
|
void *p;
|
|
size_t size;
|
|
size_t nmemb;
|
|
register FILE *stream;
|
|
{
|
|
register char *ptr = (char *) p;
|
|
register size_t to_read = size * nmemb;
|
|
size_t bytes = to_read;
|
|
|
|
if (!__validfp (stream) || !stream->__mode.__read)
|
|
{
|
|
__set_errno (EINVAL);
|
|
return 0;
|
|
}
|
|
if (feof (stream) || ferror (stream))
|
|
return 0;
|
|
if (p == NULL || to_read == 0)
|
|
return 0;
|
|
|
|
if (!stream->__seen || stream->__buffer == NULL || stream->__pushed_back)
|
|
{
|
|
/* This stream has never been seen before, or it has a character
|
|
pushed back. Call __fillbf to deal with those cases. Life will
|
|
be simpler after this call. */
|
|
int c = __fillbf (stream);
|
|
if (c == EOF)
|
|
return 0;
|
|
*ptr++ = c;
|
|
if (--to_read == 0)
|
|
return 1;
|
|
}
|
|
|
|
read_from_buffer:;
|
|
if (stream->__bufp < stream->__get_limit)
|
|
{
|
|
/* First off, empty out the buffer. */
|
|
register size_t copy = stream->__get_limit - stream->__bufp;
|
|
if (copy > to_read)
|
|
copy = to_read;
|
|
to_read -= copy;
|
|
if (copy > 20)
|
|
memcpy((void *) ptr, (void *) stream->__bufp, copy);
|
|
else
|
|
{
|
|
register size_t i;
|
|
for (i = 0; i < copy; ++i)
|
|
ptr[i] = stream->__bufp[i];
|
|
}
|
|
stream->__bufp += copy;
|
|
if (to_read == 0)
|
|
return nmemb;
|
|
ptr += copy;
|
|
}
|
|
|
|
/* Reading directly into the user's buffer doesn't help when
|
|
using a user-specified input buffer filling/expanding function,
|
|
so we don't do it in that case. */
|
|
if (to_read >= stream->__bufsize &&
|
|
stream->__room_funcs.__input == default_func &&
|
|
stream->__offset == stream->__target)
|
|
{
|
|
/* Read directly into the user's buffer. */
|
|
if (stream->__io_funcs.__read != NULL)
|
|
while (to_read > 0)
|
|
{
|
|
register int count;
|
|
count = (*stream->__io_funcs.__read) (stream->__cookie,
|
|
ptr, to_read);
|
|
if (count > 0)
|
|
{
|
|
to_read -= count;
|
|
if (stream->__offset != -1)
|
|
{
|
|
stream->__offset += count;
|
|
stream->__target += count;
|
|
}
|
|
ptr += count;
|
|
}
|
|
else if (count == 0)
|
|
{
|
|
stream->__eof = 1;
|
|
break;
|
|
}
|
|
else
|
|
{
|
|
stream->__error = 1;
|
|
break;
|
|
}
|
|
}
|
|
else
|
|
stream->__eof = 1;
|
|
}
|
|
else
|
|
{
|
|
int c = __fillbf (stream);
|
|
if (c == EOF)
|
|
return (bytes - to_read) / size;
|
|
*ptr++ = (char) c;
|
|
--to_read;
|
|
if (to_read > 0)
|
|
goto read_from_buffer;
|
|
}
|
|
|
|
return (bytes - to_read) / size;
|
|
}
|
|
|
|
weak_alias (fread, fread_unlocked)
|