mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-23 23:47:22 +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.
82 lines
2.5 KiB
C
82 lines
2.5 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.
|
|
*/
|
|
/* No user fns here. Pesch 15apr92. */
|
|
|
|
#if defined(LIBC_SCCS) && !defined(lint)
|
|
static char sccsid[] = "%W% (Berkeley) %G%";
|
|
#endif /* LIBC_SCCS and not lint */
|
|
|
|
#include <_ansi.h>
|
|
#include <stdio.h>
|
|
#include "local.h"
|
|
#include "fvwrite.h"
|
|
|
|
/*
|
|
* Write the given character into the (probably full) buffer for
|
|
* the given file. Flush the buffer out if it is or becomes full,
|
|
* or if c=='\n' and the file is line buffered.
|
|
*/
|
|
|
|
int
|
|
_DEFUN(__swbuf, (c, fp),
|
|
register int c _AND
|
|
register FILE *fp)
|
|
{
|
|
register int n;
|
|
|
|
/* Ensure stdio has been initialized. */
|
|
|
|
CHECK_INIT (_REENT);
|
|
|
|
/*
|
|
* In case we cannot write, or longjmp takes us out early,
|
|
* make sure _w is 0 (if fully- or un-buffered) or -_bf._size
|
|
* (if line buffered) so that we will get called again.
|
|
* If we did not do this, a sufficient number of putc()
|
|
* calls might wrap _w from negative to positive.
|
|
*/
|
|
|
|
fp->_w = fp->_lbfsize;
|
|
if (cantwrite (fp))
|
|
return EOF;
|
|
c = (unsigned char) c;
|
|
|
|
/*
|
|
* If it is completely full, flush it out. Then, in any case,
|
|
* stuff c into the buffer. If this causes the buffer to fill
|
|
* completely, or if c is '\n' and the file is line buffered,
|
|
* flush it (perhaps a second time). The second flush will always
|
|
* happen on unbuffered streams, where _bf._size==1; fflush()
|
|
* guarantees that putc() will always call wbuf() by setting _w
|
|
* to 0, so we need not do anything else.
|
|
*/
|
|
|
|
n = fp->_p - fp->_bf._base;
|
|
if (n >= fp->_bf._size)
|
|
{
|
|
if (fflush (fp))
|
|
return EOF;
|
|
n = 0;
|
|
}
|
|
fp->_w--;
|
|
*fp->_p++ = c;
|
|
if (++n == fp->_bf._size || (fp->_flags & __SLBF && c == '\n'))
|
|
if (fflush (fp))
|
|
return EOF;
|
|
return c;
|
|
}
|