mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-16 19:40:07 +08:00
4dc0c0c4e5
* libc/include/stdio.h: Add new reentrant I/O prototypes for
read/write functions. Change getc/putc macros to have reentrant underlying
macros/functions. This includes __sgetc_raw_r, __sgetc_r, and __sputc_r.
* libc/stdio/fgetc.c: Fix and/or add reentrant version to call
new reentrant I/O functions/macros for reading/writing.
* libc/stdio/fgets.c: Ditto.
* libc/stdio/fputc.c: Ditto.
* libc/stdio/fputs.c: Ditto.
* libc/stdio/fread.c: Ditto.
* libc/stdio/fseek.c: Ditto.
* libc/stdio64/fseeko64.c: Ditto.
* libc/stdio/fwrite.c: Ditto.
* libc/stdio/getc.c: Ditto.
* libc/stdio/getc_u.c: Ditto.
* libc/stdio/getchar.c: Ditto.
* libc/stdio/getchar_u.c: Ditto.
* libc/stdio/putc.c: Ditto.
* libc/stdio/putc_u.c: Ditto.
* libc/stdio/putchar.c: Ditto.
* libc/stdio/puts.c: Ditto.
* libc/stdio/vfprintf.c: Ditto.
* libc/stdio/vfscanf.c: Ditto.
* libc/stdio/fvwrite.c: Change __sfvwrite into reentrant __sfvwrite_r.
Change all previous callers of __sfvwrite. Set errno to EBADF and
set error flag on if attempt is made to write to file that does not
allow writing.
* libc/stdio/fvwrite.h: Fix new reentrant prototypes.
* libc/stdio/local.h: Ditto.
* libc/stdio/refill.c: Turn __srefill into reentrant __srefill_r.
Set errno to EBADF and the error flag on if attempt is made to
read unreadable file. Change all previous callers of __srefill.
* libc/stdio/rget.c
* libc/stdio/wbuf.c: Turn __swbuf into reentrant __swbuf_r. Change
all previous callers of __swbuf.
* libc/sys/linux/machine/i386/huge_val.h: Ifdef out file contents since
huge value macros are already defined correctly for i386 by <math.h>.
88 lines
2.6 KiB
C
88 lines
2.6 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 <errno.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_r, (ptr, c, fp),
|
|
struct _reent *ptr _AND
|
|
register int c _AND
|
|
register FILE *fp)
|
|
{
|
|
register int n;
|
|
|
|
/* Ensure stdio has been initialized. */
|
|
|
|
CHECK_INIT (ptr);
|
|
|
|
/*
|
|
* 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))
|
|
{
|
|
fp->_flags |= __SERR;
|
|
ptr->_errno = EBADF;
|
|
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;
|
|
}
|