mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 15:20:10 +00:00
05f732b361
1998-11-05 1998 H.J. Lu <hjl@gnu.org> * libio/iofgets.c (_IO_fgets): Don't report error if something was read in and errno is set to EAGAIN. * libio/iofgets_u.c (fgets_unlocked): Likewise. 1998-11-05 Philip Blundell <philb@gnu.org> * sysdeps/unix/sysv/linux/net/if_packet.h: Don't include kernel header; it defines too much. Provide a local definition of struct sockaddr_pkt and a comment advising against its use. 1998-11-06 1998 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * extra-lib.mk: Avoid empty include list. 1998-11-04 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * extra-lib.mk: Add support for $(lib)-shared-only-routines. * elf/Makefile (libdl-routines): Add dlopenold only if doing versioning. (libdl-shared-only-routines): New variable. 1998-11-06 Paul Eggert <eggert@twinsun.com> Don't invoke localtime_r or gmtime_r unless it's the GNU C library's localtime_r and gmtime_r; there are too many buggy implementations of localtime_r and gmtime_r out there, and it's not worth keeping track of all the different bugs. * time/mktime.c (__EXTENSIONS__): Remove. (<unistd.h>): No need to include. * time/strftime.c: Likewise. * time/mktime.c (_POSIX_THREAD_SAFE_FUNCTIONS, HAVE_LOCALTIME_R): Remove. (my_mktime_localtime_r): Renamed from localtime_r; all uses changed. Base it on localtime unless _LIBC. * time/strftime.c (my_strftime_gmtime_r): Renamed from gmtime_r; all uses changed. (my_strftime_localtime_r): Renamed from localtime_r; all uses changed. Base them on localtime/gmtime if not _LIBC. 1998-11-07 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/isastream.c: Always return 0 unless it is an invalid file descriptor. This makes this function actually usable. Proposed by Mark Kettenis <kettenis@phys.uva.nl>.
68 lines
2.2 KiB
C
68 lines
2.2 KiB
C
/* Copyright (C) 1993, 1995, 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"
|
|
#include <stdio.h>
|
|
|
|
char *
|
|
_IO_fgets (buf, n, fp)
|
|
char *buf;
|
|
int n;
|
|
_IO_FILE *fp;
|
|
{
|
|
_IO_size_t count;
|
|
char *result;
|
|
int old_error;
|
|
CHECK_FILE (fp, NULL);
|
|
if (n <= 0)
|
|
return NULL;
|
|
_IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp);
|
|
_IO_flockfile (fp);
|
|
/* This is very tricky since a file descriptor may be in the
|
|
non-blocking mode. The error flag doesn't mean much in this
|
|
case. We return an error only when there is a new error. */
|
|
old_error = fp->_IO_file_flags & _IO_ERR_SEEN;
|
|
fp->_IO_file_flags &= ~_IO_ERR_SEEN;
|
|
count = _IO_getline (fp, buf, n - 1, '\n', 1);
|
|
/* If we read in some bytes and errno is EAGAIN, that error will
|
|
be reported for next read. */
|
|
if (count == 0 || ((fp->_IO_file_flags & _IO_ERR_SEEN)
|
|
&& errno != EAGAIN))
|
|
result = NULL;
|
|
else
|
|
{
|
|
buf[count] = '\0';
|
|
result = buf;
|
|
}
|
|
fp->_IO_file_flags |= old_error;
|
|
_IO_funlockfile (fp);
|
|
_IO_cleanup_region_end (0);
|
|
return result;
|
|
}
|
|
|
|
#ifdef weak_alias
|
|
weak_alias (_IO_fgets, fgets)
|
|
#endif
|