mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 07:10:06 +00:00
0a61487785
1998-02-17 15:10 Ulrich Drepper <drepper@cygnus.com> * elf/dl-load.c (open_path): Use __xstat instead of stat. * localedata/tst-locale.sh: Comment out first test for now. 1998-02-14 14:58 H.J. Lu <hjl@gnu.org> * sysdeps/generic/_G_config.h (_G_HAVE_IO_GETLINE_INFO): Defined as 1. * sysdeps/unix/sysv/linux/_G_config.h (_G_HAVE_IO_GETLINE_INFO): Likewise. * libio/iogetline.c (_IO_getline_info): Renamed from _IO_getline. (_IO_getline): Just call _IO_getline_info. * libio/libioP.h (_IO_getline_info): New declaration. * libc.map (_IO_getline_info, __write): Added. 1998-02-17 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sunrpc/rpc_cout.c (inline_struct): Change typo of plus to const char* to shut up gcc. 1998-02-17 11:37 Ulrich Drepper <drepper@cygnus.com> * eld/dl-open.c (_dl_open): Assign correct value to new->l_global. Patch forwarded by Cristian Gafton <gafton@redhat.com>. * math/math.h: Define M_* constants always as `double' and add new macros M_*l which are of type `long double'. * sysdeps/libm-ieee754/s_cacoshl.c: Use M_*l constants now. * sysdeps/libm-ieee754/s_cacosl.c: Likewise. * sysdeps/libm-ieee754/s_casinhl.c: Likewise. * sysdeps/libm-ieee754/s_catanhl.c: Likewise. * sysdeps/libm-ieee754/s_catanl.c: Likewise. * sysdeps/libm-ieee754/s_clog10l.c: Likewise. * sysdeps/libm-ieee754/s_clogl.c: Likewise. * math/libm-tst.c: Likewise. * sysdeps/i386/fpu/bits/mathinline.h (__M_SQRT2): Don't use _Mdbl, define as long double unconditionally. 1998-02-17 Andreas Jaeger <aj@arthur.rhein-neckar.de> * manual/arith.texi (Old-style number conversion): Correct some typos. 1998-02-16 16:28 H.J. Lu <hjl@gnu.org> * time/Makefile (tz-cflags, CFLAGS-tzfile.c, CFLAGS-tzset.c): Restore. * timezone/Makefile (CFLAGS-tzfile.c, CFLAGS-tzset.c): Deleted.
116 lines
3.1 KiB
C
116 lines
3.1 KiB
C
/* Copyright (C) 1993, 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 <string.h>
|
|
|
|
#if defined _LIBC || !_G_HAVE_IO_GETLINE_INFO
|
|
|
|
_IO_size_t
|
|
_IO_getline (fp, buf, n, delim, extract_delim)
|
|
_IO_FILE *fp;
|
|
char *buf;
|
|
_IO_size_t n;
|
|
int delim;
|
|
int extract_delim;
|
|
{
|
|
return _IO_getline_info (fp, buf, n, delim, extract_delim, (int *) 0);
|
|
}
|
|
|
|
/* Algorithm based on that used by Berkeley pre-4.4 fgets implementation.
|
|
|
|
Read chars into buf (of size n), until delim is seen.
|
|
Return number of chars read (at most n).
|
|
Does not put a terminating '\0' in buf.
|
|
If extract_delim < 0, leave delimiter unread.
|
|
If extract_delim > 0, insert delim in output. */
|
|
|
|
_IO_size_t
|
|
_IO_getline_info (fp, buf, n, delim, extract_delim, eof)
|
|
_IO_FILE *fp;
|
|
char *buf;
|
|
_IO_size_t n;
|
|
int delim;
|
|
int extract_delim;
|
|
int *eof;
|
|
{
|
|
char *ptr = buf;
|
|
if (eof != NULL)
|
|
*eof = 0;
|
|
do
|
|
{
|
|
_IO_ssize_t len = fp->_IO_read_end - fp->_IO_read_ptr;
|
|
if (len <= 0)
|
|
{
|
|
int c = __uflow (fp);
|
|
if (c == EOF)
|
|
{
|
|
if (eof) *eof = c;
|
|
break;
|
|
}
|
|
if (c == delim)
|
|
{
|
|
if (extract_delim > 0)
|
|
*ptr++ = c;
|
|
else if (extract_delim < 0)
|
|
_IO_sputbackc (fp, c);
|
|
return ptr - buf;
|
|
if (extract_delim > 0)
|
|
++len;
|
|
}
|
|
*ptr++ = c;
|
|
n--;
|
|
}
|
|
else
|
|
{
|
|
char *t;
|
|
if ((_IO_size_t) len >= n)
|
|
len = n;
|
|
t = (char *) memchr ((void *) fp->_IO_read_ptr, delim, len);
|
|
if (t != NULL)
|
|
{
|
|
_IO_size_t old_len = ptr-buf;
|
|
len = t - fp->_IO_read_ptr;
|
|
if (extract_delim >= 0)
|
|
{
|
|
++t;
|
|
if (extract_delim > 0)
|
|
++len;
|
|
}
|
|
memcpy ((void *) ptr, (void *) fp->_IO_read_ptr, len);
|
|
fp->_IO_read_ptr = t;
|
|
return old_len + len;
|
|
}
|
|
memcpy ((void *) ptr, (void *) fp->_IO_read_ptr, len);
|
|
fp->_IO_read_ptr += len;
|
|
ptr += len;
|
|
n -= len;
|
|
}
|
|
} while (n != 0);
|
|
return ptr - buf;
|
|
}
|
|
|
|
#endif /* Defined _LIBC || !_G_HAVE_IO_GETLINE_INFO */
|