mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-16 11:31:00 +08:00
1159e0fd94
* libc/stdio/clearerr.c (clearerr): Ensure CHECK_INIT() is called before _flockfile to prevent lock object use before initialisation. _REENT_SMALL_CHECK_INIT() and CHECK_INIT() take a struct _reent * instead of a FILE *. * libc/stdio/fclose.c (_fclose_r): Ditto. * libc/stdio/feof.c (feof): Ditto. * libc/stdio/ferror.c (ferror): Ditto. * libc/stdio/fflush.c (fflush): Ditto. * libc/stdio/fgetc.c (fgetc): Ditto. * libc/stdio/fgets.c (fgets): Ditto. * libc/stdio/fileno.c (fileno): Ditto. * libc/stdio/fputc.c (fputc): Ditto. * libc/stdio/fputs.c (fputs): Ditto. * libc/stdio/fread.c (fread): Ditto. * libc/stdio/freopen.c (_freopen_r): Ditto. * libc/stdio/fseek.c (_fseek_r): Ditto. * libc/stdio/ftell.c (_ftell_r): Ditto. * libc/stdio/fwrite.c (fwrite): Ditto. * libc/stdio/getc.c (getc): Ditto. * libc/stdio/getdelim.c (__getdelim): Ditto. * libc/stdio/putc.c (putc): Ditto. * libc/stdio/setvbuf.c (setvbuf): Ditto. * libc/stdio/ungetc.c (_ungetc_r): Ditto. * libc/stdio/vfprintf.c (_VFPRINTF_R): Ditto. * libc/stdio64/freopen64.c (_freopen64_r): Ditto. * libc/stdio64/fseeko64.c (_fseeko64_r): Ditto. * libc/stdio64/ftello64.c (_ftello64_r): Ditto. * libc/stdio/local.h (CHECK_INIT): Argument is now a struct _reent * instead of a FILE * and so replace incorrect use of _REENT with argument. * libc/sys/arm/syscalls.c (CHECK_INIT): Ditto. * libc/stdio/getchar.c (getchar): _REENT_SMALL_CHECK_INIT() and CHECK_INIT() take a struct _reent * instead of a FILE *. * libc/stdio/iprintf.c (iprintf, _iprintf_r): Ditto. * libc/stdio/iscanf.c (iscanf, _iscanf_r): Ditto. * libc/stdio/perror.c (perror): Ditto. * libc/stdio/printf.c (printf, _printf_r): Ditto. * libc/stdio/putchar.c (putchar): Ditto. * libc/stdio/puts.c (puts): Ditto. * libc/stdio/refill.c (__srefill): Ditto. * libc/stdio/scanf.c (scanf, _scanf_r): Ditto. * libc/stdio/vfscanf.c (VFSCANF, _VFSCANF_R): Ditto. * libc/stdio/viprintf.c (viprintf, _viprintf_r): Ditto. * libc/stdio/viscanf.c (viscanf, _viscanf_r): Ditto. * libc/stdio/vprintf.c (vprintf, _vprintf_r): Ditto. * libc/stdio/vscanf.c (vscanf, _vscanf_r): Ditto. * libc/stdio/wbuf.c (__swbuf): Ditto. * libc/stdio/wsetup.c (__swsetup): Ditto. * libc/stdlib/mallocr.c (malloc_stats): Ditto. * libc/stdlib/mstats.c (_mstats_r): Ditto. * libc/include/sys/reent.h (_REENT_SMALL_CHECK_INIT): Ditto. * libc/machine/powerpc/vfscanf.c (vfscanf): Ditto. * libc/stdio/fgetpos.c (_fgetpos_r): Removed unnecessary calls to _flockfile and _funlockfile; rely on locking in _ftell_r. * libc/stdio64/fgetpos64.c (_fgetpos64_r): Ditto (_ftello64_r). * libc/machine/powerpc/vfprintf.c (__sbprintf): Removed unnecessary initialision of _data field in FILE structure. * libc/machine/powerpc/vfprintf.c (VFPRINTF): Added CHECK_INIT() call.
143 lines
2.9 KiB
C
143 lines
2.9 KiB
C
/* Copyright 2002, Red Hat Inc. - all rights reserved */
|
|
/*
|
|
FUNCTION
|
|
<<getdelim>>---read a line up to a specified line delimeter
|
|
|
|
INDEX
|
|
getdelim
|
|
|
|
ANSI_SYNOPSIS
|
|
#include <stdio.h>
|
|
int getdelim(char **<[bufptr]>, size_t *<[n]>,
|
|
int <[delim]>, FILE *<[fp]>);
|
|
|
|
TRAD_SYNOPSIS
|
|
#include <stdio.h>
|
|
int getdelim(<[bufptr]>, <[n]>, <[delim]>, <[fp]>)
|
|
char **<[bufptr]>;
|
|
size_t *<[n]>;
|
|
int <[delim]>;
|
|
FILE *<[fp]>;
|
|
|
|
DESCRIPTION
|
|
<<getdelim>> reads a file <[fp]> up to and possibly including a specified
|
|
delimeter <[delim]>. The line is read into a buffer pointed to
|
|
by <[bufptr]> and designated with size *<[n]>. If the buffer is
|
|
not large enough, it will be dynamically grown by <<getdelim>>.
|
|
As the buffer is grown, the pointer to the size <[n]> will be
|
|
updated.
|
|
|
|
RETURNS
|
|
<<getdelim>> returns <<-1>> if no characters were successfully read,
|
|
otherwise, it returns the number of bytes successfully read.
|
|
at end of file, the result is nonzero.
|
|
|
|
PORTABILITY
|
|
<<getdelim>> is a glibc extension.
|
|
|
|
No supporting OS subroutines are directly required.
|
|
*/
|
|
|
|
#include <_ansi.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <errno.h>
|
|
#include "local.h"
|
|
|
|
#define MIN_LINE_SIZE 4
|
|
#define DEFAULT_LINE_SIZE 128
|
|
|
|
ssize_t
|
|
_DEFUN(__getdelim, (bufptr, n, delim, fp),
|
|
char **bufptr _AND
|
|
size_t *n _AND
|
|
int delim _AND
|
|
FILE *fp)
|
|
{
|
|
char *buf;
|
|
char *ptr;
|
|
size_t newsize, numbytes;
|
|
int pos;
|
|
int ch;
|
|
int cont;
|
|
|
|
if (fp == NULL || bufptr == NULL || n == NULL)
|
|
{
|
|
errno = EINVAL;
|
|
return -1;
|
|
}
|
|
|
|
buf = *bufptr;
|
|
if (buf == NULL || *n < MIN_LINE_SIZE)
|
|
{
|
|
buf = (char *)realloc (*bufptr, DEFAULT_LINE_SIZE);
|
|
if (buf == NULL)
|
|
{
|
|
return -1;
|
|
}
|
|
*bufptr = buf;
|
|
*n = DEFAULT_LINE_SIZE;
|
|
}
|
|
|
|
CHECK_INIT (_REENT);
|
|
|
|
_flockfile (fp);
|
|
|
|
numbytes = *n;
|
|
ptr = buf;
|
|
|
|
cont = 1;
|
|
|
|
while (cont)
|
|
{
|
|
/* fill buffer - leaving room for nul-terminator */
|
|
while (--numbytes > 0)
|
|
{
|
|
if ((ch = getc_unlocked (fp)) == EOF)
|
|
{
|
|
cont = 0;
|
|
break;
|
|
}
|
|
else
|
|
{
|
|
*ptr++ = ch;
|
|
if (ch == delim)
|
|
{
|
|
cont = 0;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (cont)
|
|
{
|
|
/* Buffer is too small so reallocate a larger buffer. */
|
|
pos = ptr - buf;
|
|
newsize = (*n << 1);
|
|
buf = realloc (buf, newsize);
|
|
if (buf == NULL)
|
|
{
|
|
cont = 0;
|
|
break;
|
|
}
|
|
|
|
/* After reallocating, continue in new buffer */
|
|
*bufptr = buf;
|
|
*n = newsize;
|
|
ptr = buf + pos;
|
|
numbytes = newsize - pos;
|
|
}
|
|
}
|
|
|
|
_funlockfile (fp);
|
|
|
|
/* if no input data, return failure */
|
|
if (ptr == buf)
|
|
return -1;
|
|
|
|
/* otherwise, nul-terminate and return number of bytes read */
|
|
*ptr = '\0';
|
|
return (ssize_t)(ptr - buf);
|
|
}
|
|
|