mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 11:20:07 +00:00
7c713e287e
* Rules (subdir_install): Depend on $(common-objpfx)sor-$(subdir). [! libc.so-version]: Clear static-only-routines. ($(common-objpfx)sor-$(subdir)): New target. [static-only-routines]: New static pattern rule for these .so's. * Makerules [libc.so-version] ($(slibdir)/libc.so): Target removed. [libc.so-version] ($(libdir)/libc.so, $(common-objpfx)libc-syms.so): New targets replace it. (install) [libc.so-version]: Depend on $(libdir)/libc.so instead of $(slibdir)/libc.so. * io/Makefile (static-only-routines): New variable. * configure.in: Check for tools objdump and objcopy, and for awk. * config.make.in (OBJDUMP, OBJCOPY, AWK): New variables. Thu May 9 01:24:00 1996 Ulrich Drepper <drepper@cygnus.com> * locale/programs/config.h: Remove definition of wint_t. * locale/programs/ld-collate.c: Include <wchar.h> instead of <wcstr.h>. * manual/time.texi: Add some more description for %U and %W format of strftime. Describe new format %V of strftime. * resolv/gethnamaddr.c: Prevent warning by preventing variable definition. * stdio-common/_itoa.c: Ditto. Tue May 7 23:43:07 1996 Ulrich Drepper <drepper@cygnus.com> * libio/clearerr.c, libio/feof.c, libio/ferror.c, libio/fgetc.c, libio/fileno.c, libio/fputc.c, libio/freopen.c, libio/fseek.c, libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c, libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c, libio/iofputs.c, libio/iofread.c, libio/iofsetpos.c, libio/ioftell.c, libio/iofwrite.c, libio/iogetdelim.c, libio/iogets.c, libio/ioputs.c, libio/iosetbuffer.c, libio/iosetvbuf.c, libio/ioungetc.c, libio/iovsprintf.c, libio/libio.h, libio/putc.c, libio/putchar.c, libio/rewind.c, libio/stdio.h, stdio-common/printf_fp.c, stdio-common/vfprintf.c, stdio-common/vfscanf.c: Prepare for reentrent libio. * libio/clearerr_u.c, libio/feof_u.c, libio/ferror_u.c, libio/fputc_u.c, libio/getc_u.c, libio/getchar_u.c, libio/iofflush_u.c, libio/putc_u.c, libio/putchar_u.c: New files. Used in reentrent libio. * misc/getusershell.c: Prevent warnings.
124 lines
3.2 KiB
C
124 lines
3.2 KiB
C
/*
|
|
Copyright (C) 1994 Free Software Foundation
|
|
|
|
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. */
|
|
|
|
#ifdef __STDC__
|
|
#include <stdlib.h>
|
|
#endif
|
|
#include "libioP.h"
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
|
|
/* Read up to (and including) a TERMINATOR from FP into *LINEPTR
|
|
(and null-terminate it). *LINEPTR is a pointer returned from malloc (or
|
|
NULL), pointing to *N characters of space. It is realloc'ed as
|
|
necessary. Returns the number of characters read (not including the
|
|
null terminator), or -1 on error or EOF. */
|
|
|
|
_IO_ssize_t
|
|
_IO_getdelim (lineptr, n, delimiter, fp)
|
|
char **lineptr;
|
|
_IO_size_t *n;
|
|
int delimiter;
|
|
_IO_FILE *fp;
|
|
{
|
|
int result;
|
|
register _IO_ssize_t cur_len = 0;
|
|
_IO_ssize_t len;
|
|
|
|
if (lineptr == NULL || n == NULL)
|
|
{
|
|
#ifdef EINVAL
|
|
errno = EINVAL;
|
|
#endif
|
|
return -1;
|
|
}
|
|
CHECK_FILE (fp, -1);
|
|
_IO_flockfile (fp);
|
|
if (_IO_ferror_unlocked (fp))
|
|
{
|
|
result = -1;
|
|
goto unlock_return;
|
|
}
|
|
|
|
if (*lineptr == NULL || *n == 0)
|
|
{
|
|
*n = 120;
|
|
*lineptr = (char *) malloc (*n);
|
|
if (*lineptr == NULL)
|
|
{
|
|
result = -1;
|
|
goto unlock_return;
|
|
}
|
|
}
|
|
|
|
len = fp->_IO_read_end - fp->_IO_read_ptr;
|
|
if (len <= 0)
|
|
{
|
|
if (__underflow (fp) == EOF)
|
|
{
|
|
result = -1;
|
|
goto unlock_return;
|
|
}
|
|
len = fp->_IO_read_end - fp->_IO_read_ptr;
|
|
}
|
|
|
|
for (;;)
|
|
{
|
|
_IO_size_t needed;
|
|
char *t;
|
|
t = (char *) memchr ((void *) fp->_IO_read_ptr, delimiter, len);
|
|
if (t != NULL)
|
|
len = (t - fp->_IO_read_ptr) + 1;
|
|
/* Make enough space for len+1 (for final NUL) bytes. */
|
|
needed = cur_len + len + 1;
|
|
if (needed > *n)
|
|
{
|
|
if (needed < 2 * *n)
|
|
needed = 2 * *n; /* Be generous. */
|
|
*n = needed;
|
|
*lineptr = (char *) realloc (*lineptr, needed);
|
|
if (*lineptr == NULL)
|
|
{
|
|
result = -1;
|
|
goto unlock_return;
|
|
}
|
|
}
|
|
memcpy (*lineptr + cur_len, (void *) fp->_IO_read_ptr, len);
|
|
fp->_IO_read_ptr += len;
|
|
cur_len += len;
|
|
if (t != NULL || __underflow (fp) == EOF)
|
|
break;
|
|
len = fp->_IO_read_end - fp->_IO_read_ptr;
|
|
}
|
|
(*lineptr)[cur_len] = '\0';
|
|
result = cur_len;
|
|
|
|
unlock_return:
|
|
_IO_funlockfile (fp);
|
|
return result;
|
|
}
|
|
|
|
weak_alias (_IO_getdelim, __getdelim)
|
|
weak_alias (_IO_getdelim, getdelim)
|