mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-15 11:00:04 +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.
159 lines
3.7 KiB
C
159 lines
3.7 KiB
C
/*
|
|
* Copyright (c) 1990 The Regents of the University of California.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms are permitted
|
|
* provided that the above copyright notice and this paragraph are
|
|
* duplicated in all such forms and that any documentation,
|
|
* advertising materials, and other materials related to such
|
|
* distribution and use acknowledge that the software was developed
|
|
* by the University of California, Berkeley. The name of the
|
|
* University may not be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
|
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
*/
|
|
|
|
/*
|
|
FUNCTION
|
|
<<fgets>>---get character string from a file or stream
|
|
|
|
INDEX
|
|
fgets
|
|
|
|
ANSI_SYNOPSIS
|
|
#include <stdio.h>
|
|
char *fgets(char *<[buf]>, int <[n]>, FILE *<[fp]>);
|
|
|
|
TRAD_SYNOPSIS
|
|
#include <stdio.h>
|
|
char *fgets(<[buf]>,<[n]>,<[fp]>)
|
|
char *<[buf]>;
|
|
int <[n]>;
|
|
FILE *<[fp]>;
|
|
|
|
DESCRIPTION
|
|
Reads at most <[n-1]> characters from <[fp]> until a newline
|
|
is found. The characters including to the newline are stored
|
|
in <[buf]>. The buffer is terminated with a 0.
|
|
|
|
|
|
RETURNS
|
|
<<fgets>> returns the buffer passed to it, with the data
|
|
filled in. If end of file occurs with some data already
|
|
accumulated, the data is returned with no other indication. If
|
|
no data are read, NULL is returned instead.
|
|
|
|
PORTABILITY
|
|
<<fgets>> should replace all uses of <<gets>>. Note however
|
|
that <<fgets>> returns all of the data, while <<gets>> removes
|
|
the trailing newline (with no indication that it has done so.)
|
|
|
|
Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
|
|
<<lseek>>, <<read>>, <<sbrk>>, <<write>>.
|
|
*/
|
|
|
|
#include <_ansi.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include "local.h"
|
|
|
|
/*
|
|
* Read at most n-1 characters from the given file.
|
|
* Stop when a newline has been read, or the count runs out.
|
|
* Return first argument, or NULL if no characters were read.
|
|
*/
|
|
|
|
char *
|
|
_DEFUN(fgets, (buf, n, fp),
|
|
char *buf _AND
|
|
int n _AND
|
|
FILE * fp)
|
|
{
|
|
size_t len;
|
|
char *s;
|
|
unsigned char *p, *t;
|
|
|
|
if (n < 2) /* sanity check */
|
|
return 0;
|
|
|
|
s = buf;
|
|
|
|
CHECK_INIT(_REENT);
|
|
|
|
_flockfile (fp);
|
|
#ifdef __SCLE
|
|
if (fp->_flags & __SCLE)
|
|
{
|
|
int c;
|
|
/* Sorry, have to do it the slow way */
|
|
while (--n > 0 && (c = __sgetc (fp)) != EOF)
|
|
{
|
|
*s++ = c;
|
|
if (c == '\n')
|
|
break;
|
|
}
|
|
if (c == EOF && s == buf)
|
|
{
|
|
_funlockfile (fp);
|
|
return NULL;
|
|
}
|
|
*s = 0;
|
|
_funlockfile (fp);
|
|
return buf;
|
|
}
|
|
#endif
|
|
|
|
n--; /* leave space for NUL */
|
|
do
|
|
{
|
|
/*
|
|
* If the buffer is empty, refill it.
|
|
*/
|
|
if ((len = fp->_r) <= 0)
|
|
{
|
|
if (__srefill (fp))
|
|
{
|
|
/* EOF: stop with partial or no line */
|
|
if (s == buf)
|
|
{
|
|
_funlockfile (fp);
|
|
return 0;
|
|
}
|
|
break;
|
|
}
|
|
len = fp->_r;
|
|
}
|
|
p = fp->_p;
|
|
|
|
/*
|
|
* Scan through at most n bytes of the current buffer,
|
|
* looking for '\n'. If found, copy up to and including
|
|
* newline, and stop. Otherwise, copy entire chunk
|
|
* and loop.
|
|
*/
|
|
if (len > n)
|
|
len = n;
|
|
t = (unsigned char *) memchr ((_PTR) p, '\n', len);
|
|
if (t != 0)
|
|
{
|
|
len = ++t - p;
|
|
fp->_r -= len;
|
|
fp->_p = t;
|
|
_CAST_VOID memcpy ((_PTR) s, (_PTR) p, len);
|
|
s[len] = 0;
|
|
_funlockfile (fp);
|
|
return (buf);
|
|
}
|
|
fp->_r -= len;
|
|
fp->_p += len;
|
|
_CAST_VOID memcpy ((_PTR) s, (_PTR) p, len);
|
|
s += len;
|
|
}
|
|
while ((n -= len) != 0);
|
|
*s = 0;
|
|
_funlockfile (fp);
|
|
return buf;
|
|
}
|