0261d33f87
2003-08-29 Jakub Jelinek <jakub@redhat.com> * libio/Makefile: Compile fputc.c, fputwc.c, freopen64.c, freopen.c, fseek.c, fseeko64.c, fseeko.c, ftello64.c, ftello.c, fwide.c, getc.c, getchar.c, getwc.c, getwchar.c, iofclose.c, iofflush.c, iofgetpos64.c, iofgetpos.c, iofgets.c, iofgetws.c, iofputs.c, iofputws.c, iofread.c, iofsetpos64.c, iofsetpos.c, ioftell.c, iofwrite.c, iogetdelim.c, iogetline.c, iogets.c, iogetwline.c, ioputs.c, ioseekoff.c, ioseekpos.c, iosetbuffer.c, iosetvbuf.c, ioungetc.c, ioungetwc.c, oldfileops.c, oldiofclose.c, oldiofgetpos64.c, oldiofgetpos.c, oldiofsetpos64.c, oldiofsetpos.c, peekc.c, putc.c, putchar.c, putwc.c, putwchar.c and rewind.c with exceptions. * sysdeps/generic/bits/stdio-lock.h (_IO_acquire_lock, _IO_release_lock): Define. * libio/fileops.c (_IO_new_file_underflow): Use it. * libio/fputc.c (fputc): Likewise. * libio/fputwc.c (fputwc): Likewise. * libio/freopen64.c (freopen64): * libio/freopen.c (freopen): Likewise. * libio/fseek.c (fseek): Likewise. * libio/fseeko64.c (fseeko64): Likewise. * libio/fseeko.c (fseeko): Likewise. * libio/ftello64.c (ftello64): Likewise. * libio/ftello.c (ftello): Likewise. * libio/fwide.c (fwide): Likewise. * libio/getc.c (_IO_getc): Likewise. * libio/getchar.c (getchar): Likewise. * libio/getwc.c (_IO_getwc): Likewise. * libio/getwchar.c (getwchar): Likewise. * libio/iofclose.c (_IO_new_fclose): * libio/iofflush.c (_IO_fflush): Likewise. * libio/iofgetpos64.c (_IO_new_fgetpos64): Likewise. * libio/iofgetpos.c (_IO_new_fgetpos): Likewise. * libio/iofgets.c (_IO_fgets): Likewise. * libio/iofgetws.c (fgetws): Likewise. * libio/iofputs.c (_IO_fputs): * libio/iofputws.c (_IO_fputs): Likewise. * libio/iofread.c (_IO_fread): Likewise. * libio/iofsetpos64.c (_IO_new_fsetpos64): Likewise. * libio/iofsetpos.c (_IO_new_fsetpos): Likewise. * libio/ioftell.c (_IO_ftell): Likewise. * libio/iofwrite.c (_IO_fwrite): Likewise. * libio/iogetdelim.c (_IO_getdelim): Likewise. * libio/iogets.c (_IO_gets): Likewise. * libio/ioputs.c (_IO_puts): Likewise. * libio/ioseekoff.c (_IO_seekoff): Likewise. * libio/ioseekpos.c (_IO_seekpos): Likewise. * libio/iosetbuffer.c (_IO_setbuffer): Likewise. * libio/iosetvbuf.c (_IO_setvbuf): Likewise. * libio/ioungetc.c (_IO_ungetc): Likewise. * libio/ioungetwc.c (ungetwc): Likewise. * libio/oldiofclose.c (_IO_old_fclose): Likewise. * libio/oldiofgetpos64.c (_IO_old_fgetpos64): Likewise. * libio/oldiofgetpos.c (_IO_old_fgetpos): Likewise. * libio/oldiofsetpos64.c (_IO_old_fsetpos64): Likewise. * libio/oldiofsetpos.c (_IO_old_fsetpos): Likewise. * libio/peekc.c (_IO_peekc_locked): Likewise. * libio/putc.c (_IO_putc): Likewise. * libio/putchar.c (putchar): Likewise. * libio/putwc.c (putwc): Likewise. * libio/putwchar.c (putwchar): Likewise. * libio/rewind.c (rewind): Likewise. * libio/wfileops.c (_IO_wfile_underflow): Likewise.
130 lines
3.5 KiB
C
130 lines
3.5 KiB
C
/* Copyright (C) 1994,1996,1997,1998,2001,2003 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. */
|
|
|
|
#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;
|
|
_IO_ssize_t cur_len = 0;
|
|
_IO_ssize_t len;
|
|
|
|
if (lineptr == NULL || n == NULL)
|
|
{
|
|
MAYBE_SET_EINVAL;
|
|
return -1;
|
|
}
|
|
CHECK_FILE (fp, -1);
|
|
_IO_acquire_lock (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)
|
|
{
|
|
char *new_lineptr;
|
|
|
|
if (needed < 2 * *n)
|
|
needed = 2 * *n; /* Be generous. */
|
|
new_lineptr = (char *) realloc (*lineptr, needed);
|
|
if (new_lineptr == NULL)
|
|
{
|
|
result = -1;
|
|
goto unlock_return;
|
|
}
|
|
*lineptr = new_lineptr;
|
|
*n = needed;
|
|
}
|
|
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_release_lock (fp);
|
|
return result;
|
|
}
|
|
|
|
#ifdef weak_alias
|
|
weak_alias (_IO_getdelim, __getdelim)
|
|
weak_alias (_IO_getdelim, getdelim)
|
|
#endif
|