mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-15 19:09:58 +08:00
8d9112f2f3
* libc/include/wchar.h: Likewise. * libc/include/sys/syslimits.h: Likewise. * libc/locale/fix_grouping.c: Likewise. * libc/locale/ldpart.c: Likewise. * libc/locale/ldpart.h: Likewise. * libc/locale/lmessages.c: Likewise. * libc/locale/lmessages.h: Likewise. * libc/locale/lmonetary.c: Likewise. * libc/locale/lmonetary.h: Likewise. * libc/locale/lnumeric.c: Likewise. * libc/locale/lnumeric.h: Likewise. * libc/locale/nl_langinfo.3: Likewise. * libc/locale/nl_langinfo.c: Likewise. * libc/locale/timelocal.c: Likewise. * libc/locale/timelocal.h: Likewise. * libc/stdlib/btowc.c: Likewise. * libc/stdlib/mbrlen.c: Likewise. * libc/stdlib/mbrtowc.c: Likewise. * libc/stdlib/mbsinit.c: Likewise. * libc/stdlib/mbsrtowcs.c: Likewise. * libc/stdlib/wcrtomb.c: Likewise. * libc/stdlib/wcsrtombs.c: Likewise. * libc/stdlib/wctob.c: Likewise. * libc/sys/linux/prof-freq.c: Likewise. * libc/sys/linux/profile.c: Likewise. * libc/sys/linux/machine/i386/dl-procinfo.c: Likewise. * libc/sys/linux/machine/i386/dl-procinfo.h: Likewise. * libc/include/stdlib.h: Change re-entrant functions to take mbstate_t pointers. * libc/include/sys/_types.h: Define _mbstate_t. * libc/include/sys/config.h (MB_LEN_MAX): New macro. * libc/include/sys/errno.h (EILSEQ): New error code. * libc/include/sys/reent.h: Include wchar.h. Change reentrant structure to use mbstate_t. * libc/locale/Makefile.am (LIB_SOURCES): Add new files. * libc/machine/powerpc/vfprintf.c: Use mbstate_t. * libc/machine/powerpc/vfscanf.c: Likewise. * libc/stdio/getdelim.c: Reallocate buffer only when necessary. * libc/stdio/vfprintf.c: Likewise. * libc/stdio/vfscanf.c: Likewise. * libc/stdlib/Makefile.am (LIB_SOURCES): Add new files. * libc/stdlib/mblen.c: Use mbstate_t. * libc/stdlib/mblen_r.c: Likewise. * libc/stdlib/mbstowcs.c: Likewise. * libc/stdlib/mbstowcs_r.c: Likewise. * libc/stdlib/mbtowc.c: Likewise. * libc/stdlib/mbtowc_r.c: Likewise. * libc/stdlib/wcstombs.c: Likewise. * libc/stdlib/wcstombs_r.c: Likewise. * libc/stdlib/wctomb_r.c: Likewise. * libc/sys/linux/Makefile.am (LIB_SOURCES): Add prof-freq.c and profile.c. * libc/sys/linux/machine/i386/Makefile.am (LIB_SOURCES): Add dl-procinfo.c. * libc/sys/linux/sys/errno.h (EILSEQ): New error code. * libc/sys/linux/sys/types.h (off_t): Define type. * testsuite/newlib.locale/UTF-8.c: Change locale name from UTF-8 to C-UTF-8. * testsuite/newlib.locale/UTF-8.exp: Likewise.
143 lines
2.9 KiB
C
143 lines
2.9 KiB
C
/*
|
|
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.
|
|
*/
|
|
|
|
/* Copyright 2002, Red Hat Inc. - all rights reserved */
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <errno.h>
|
|
#include "local.h"
|
|
|
|
#define MIN_LINE_SIZE 4
|
|
#define DEFAULT_LINE_SIZE 128
|
|
|
|
ssize_t
|
|
__getdelim (bufptr, n, delim, fp)
|
|
char **bufptr;
|
|
size_t *n;
|
|
int delim;
|
|
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;
|
|
}
|
|
|
|
_flockfile(fp);
|
|
|
|
CHECK_INIT(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);
|
|
}
|
|
|