mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-28 18:10:23 +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>.
128 lines
3.0 KiB
C
128 lines
3.0 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. */
|
|
|
|
#include <_ansi.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <errno.h>
|
|
#include "local.h"
|
|
|
|
static int
|
|
_DEFUN(lflush, (fp),
|
|
FILE *fp)
|
|
{
|
|
if ((fp->_flags & (__SLBF | __SWR)) == (__SLBF | __SWR))
|
|
return fflush (fp);
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Refill a stdio buffer.
|
|
* Return EOF on eof or error, 0 otherwise.
|
|
*/
|
|
|
|
int
|
|
_DEFUN(__srefill_r, (ptr, fp),
|
|
struct _reent * ptr _AND
|
|
register FILE * fp)
|
|
{
|
|
/* make sure stdio is set up */
|
|
|
|
CHECK_INIT (_REENT);
|
|
|
|
fp->_r = 0; /* largely a convenience for callers */
|
|
|
|
#ifndef __CYGWIN__
|
|
/* SysV does not make this test; take it out for compatibility */
|
|
if (fp->_flags & __SEOF)
|
|
return EOF;
|
|
#endif
|
|
|
|
/* if not already reading, have to be reading and writing */
|
|
if ((fp->_flags & __SRD) == 0)
|
|
{
|
|
if ((fp->_flags & __SRW) == 0)
|
|
{
|
|
ptr->_errno = EBADF;
|
|
fp->_flags |= __SERR;
|
|
return EOF;
|
|
}
|
|
/* switch to reading */
|
|
if (fp->_flags & __SWR)
|
|
{
|
|
if (fflush (fp))
|
|
return EOF;
|
|
fp->_flags &= ~__SWR;
|
|
fp->_w = 0;
|
|
fp->_lbfsize = 0;
|
|
}
|
|
fp->_flags |= __SRD;
|
|
}
|
|
else
|
|
{
|
|
/*
|
|
* We were reading. If there is an ungetc buffer,
|
|
* we must have been reading from that. Drop it,
|
|
* restoring the previous buffer (if any). If there
|
|
* is anything in that buffer, return.
|
|
*/
|
|
if (HASUB (fp))
|
|
{
|
|
FREEUB (fp);
|
|
if ((fp->_r = fp->_ur) != 0)
|
|
{
|
|
fp->_p = fp->_up;
|
|
return 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (fp->_bf._base == NULL)
|
|
__smakebuf (fp);
|
|
|
|
/*
|
|
* Before reading from a line buffered or unbuffered file,
|
|
* flush all line buffered output files, per the ANSI C
|
|
* standard.
|
|
*/
|
|
|
|
if (fp->_flags & (__SLBF | __SNBF))
|
|
_CAST_VOID _fwalk (_GLOBAL_REENT, lflush);
|
|
fp->_p = fp->_bf._base;
|
|
fp->_r = (*fp->_read) (fp->_cookie, (char *) fp->_p, fp->_bf._size);
|
|
fp->_flags &= ~__SMOD; /* buffer contents are again pristine */
|
|
#ifndef __CYGWIN__
|
|
if (fp->_r <= 0)
|
|
#else
|
|
if (fp->_r > 0)
|
|
fp->_flags &= ~__SEOF;
|
|
else
|
|
#endif
|
|
{
|
|
if (fp->_r == 0)
|
|
fp->_flags |= __SEOF;
|
|
else
|
|
{
|
|
fp->_r = 0;
|
|
fp->_flags |= __SERR;
|
|
}
|
|
return EOF;
|
|
}
|
|
return 0;
|
|
}
|