mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-08 22:30:07 +00:00
77fe0b9cd8
2002-02-25 Ulrich Drepper <drepper@redhat.com> * assert/assert-perr.c: Use INTUSE to reference functions and variables inside libc itself. Ise INTDEF and INTDEF2 to define appropriate aliases. Add prototypes for the new aliases. * assert/assert.c: Likewise. * include/libc-symbols.h: Likewise. * include/stdio.h: Likewise. * include/netinet/in.h: Likewise. * include/rpc/auth.h: Likewise. * include/rpc/auth_unix.h: Likewise. * include/rpc/key_prot.h: Likewise. * include/rpc/pmap_prot.h: Likewise. * include/rpc/pmap_rmt.h: Likewise. * include/rpc/rpc_msg.h: Likewise. * include/rpc/xdr.h: Likewise. * inet/gethstbyad_r.c: Likewise. * inet/gethstbynm2_r.c: Likewise. * inet/gethstbynm_r.c: Likewise. * inet/gethstent_r.c: Likewise. * inet/in6_addr.c: Likewise. * libio/__fpurge.c: Likewise. * libio/filedoalloc.c: Likewise. * libio/fileops.c: Likewise. * libio/ftello.c: Likewise. * libio/ftello64.c: Likewise. * libio/genops.c: Likewise. * libio/iofclose.c: Likewise. * libio/iofdopen.c: Likewise. * libio/iofflush.c: Likewise. * libio/iofflush_u.c: Likewise. * libio/iofgetpos.c: Likewise. * libio/iofgetpos64.c: Likewise. * libio/iofgets.c: Likewise. * libio/iofgets_u.c: Likewise. * libio/iofopen.c: Likewise. * libio/iofopncook.c: Likewise. * libio/iofputs.c: Likewise. * libio/iofread.c: Likewise. * libio/iofread_u.c: Likewise. * libio/iofsetpos.c: Likewise. * libio/iofsetpos64.c: Likewise. * libio/ioftell.c: Likewise. * libio/iofwrite.c: Likewise. * libio/iogetline.c: Likewise. * libio/iogets.c: Likewise. * libio/iogetwline.c: Likewise. * libio/iolibio.h: Likewise. * libio/iopadn.c: Likewise. * libio/iopopen.c: Likewise. * libio/ioseekoff.c: Likewise. * libio/ioseekpos.c: Likewise. * libio/iosetbuffer.c: Likewise. * libio/iosetvbuf.c: Likewise. * libio/ioungetc.c: Likewise. * libio/ioungetwc.c: Likewise. * libio/iovdprintf.c: Likewise. * libio/iovsprintf.c: Likewise. * libio/iovsscanf.c: Likewise. * libio/libioP.h: Likewise. * libio/memstream.c: Likewise. * libio/obprintf.c: Likewise. * libio/oldfileops.c: Likewise. * libio/oldiofclose.c: Likewise. * libio/oldiofdopen.c: Likewise. * libio/oldiofgetpos.c: Likewise. * libio/oldiofgetpos64.c: Likewise. * libio/oldiofopen.c: Likewise. * libio/oldiofsetpos.c: Likewise. * libio/oldiofsetpos64.c: Likewise. * libio/oldiopopen.c: Likewise. * libio/oldstdfiles.c: Likewise. * libio/putc.c: Likewise. * libio/setbuf.c: Likewise. * libio/setlinebuf.c: Likewise. * libio/stdfiles.c: Likewise. * libio/stdio.c: Likewise. * libio/strops.c: Likewise. * libio/vasprintf.c: Likewise. * libio/vscanf.c: Likewise. * libio/vsnprintf.c: Likewise. * libio/vswprintf.c: Likewise. * libio/wfiledoalloc.c: Likewise. * libio/wfileops.c: Likewise. * libio/wgenops.c: Likewise. * libio/wstrops.c: Likewise. * malloc/mtrace.c: Likewise. * misc/error.c: Likewise. * misc/syslog.c: Likewise. * nss/getXXbyYY_r.c: Likewise. * nss/getXXent_r.c: Likewise. * nss/hosts-lookup.c: Likewise. * stdio-common/getw.c * stdio-common/printf-prs.c: Likewise. * stdio-common/printf_fp.c: Likewise. * stdio-common/printf_size.c: Likewise. * stdio-common/putw.c: Likewise. * stdio-common/scanf.c: Likewise. * stdio-common/sprintf.c: Likewise. * stdio-common/tmpfile64.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * stdlib/strfmon.c: Likewise. * sunrpc/auth_des.c: Likewise. * sunrpc/auth_none.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/authdes_prot.c: Likewise. * sunrpc/authuxprot.c: Likewise. * sunrpc/clnt_perr.c: Likewise. * sunrpc/clnt_raw.c: Likewise. * sunrpc/clnt_tcp.c: Likewise. * sunrpc/clnt_udp.c: Likewise. * sunrpc/clnt_unix.c: Likewise. * sunrpc/key_call.c: Likewise. * sunrpc/key_prot.c: Likewise. * sunrpc/openchild.c: Likewise. * sunrpc/pm_getmaps.c: Likewise. * sunrpc/pm_getport.c: Likewise. * sunrpc/pmap_clnt.c: Likewise. * sunrpc/pmap_prot.c: Likewise. * sunrpc/pmap_prot2.c: Likewise. * sunrpc/pmap_rmt.c: Likewise. * sunrpc/rpc_cmsg.c: Likewise. * sunrpc/rpc_prot.c: Likewise. * sunrpc/svc_authux.c: Likewise. * sunrpc/svc_raw.c: Likewise. * sunrpc/svc_simple.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sunrpc/svc_unix.c: Likewise. * sunrpc/xdr.c: Likewise. * sunrpc/xdr_array.c: Likewise. * sunrpc/xdr_mem.c: Likewise. * sunrpc/xdr_rec.c: Likewise. * sunrpc/xdr_ref.c: Likewise. * sunrpc/xdr_stdio.c: Likewise. * sysdeps/generic/_strerror.c: Likewise. * sysdeps/generic/printf_fphex.c: Likewise. * sysdeps/generic/tmpfile.c: Likewise. * sysdeps/gnu/errlist.awk: Likewise. * sysdeps/gnu/errlist.c: Likewise. * libio/Makefile (routines): Remove iosprint. * libio/iosprintf.c: Removed
123 lines
3.4 KiB
C
123 lines
3.4 KiB
C
/* Copyright (C) 1993,1997,1998,2000,2001,2002 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 Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA.
|
|
|
|
As a special exception, if you link the code in this file with
|
|
files compiled with a GNU compiler to produce an executable,
|
|
that does not cause the resulting executable to be covered by
|
|
the GNU Lesser General Public License. This exception does not
|
|
however invalidate any other reasons why the executable file
|
|
might be covered by the GNU Lesser General Public License.
|
|
This exception applies to code released by its copyright holders
|
|
in files containing the exception. */
|
|
|
|
#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 INTUSE(_IO_getline_info) (fp, buf, n, delim, extract_delim,
|
|
(int *) 0);
|
|
}
|
|
INTDEF(_IO_getline)
|
|
|
|
/* 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;
|
|
if (__builtin_expect (fp->_mode, -1) == 0)
|
|
_IO_fwide (fp, -1);
|
|
while (n != 0)
|
|
{
|
|
_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)
|
|
INTUSE(_IO_sputbackc) (fp, c);
|
|
if (extract_delim > 0)
|
|
++len;
|
|
return ptr - buf;
|
|
}
|
|
*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;
|
|
}
|
|
}
|
|
return ptr - buf;
|
|
}
|
|
INTDEF(_IO_getline_info)
|
|
|
|
#endif /* Defined _LIBC || !_G_HAVE_IO_GETLINE_INFO */
|