mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-15 19:09:58 +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.
175 lines
4.3 KiB
C
175 lines
4.3 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.
|
|
*/
|
|
|
|
#if defined(LIBC_SCCS) && !defined(lint)
|
|
static char sccsid[] = "%W% (Berkeley) %G%";
|
|
#endif /* LIBC_SCCS and not lint */
|
|
|
|
#include <_ansi.h>
|
|
#include <reent.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include "local.h"
|
|
|
|
/*
|
|
* Expand the ungetc buffer `in place'. That is, adjust fp->_p when
|
|
* the buffer moves, so that it points the same distance from the end,
|
|
* and move the bytes in the buffer around as necessary so that they
|
|
* are all at the end (stack-style).
|
|
*/
|
|
|
|
/*static*/
|
|
int
|
|
_DEFUN(__submore, (rptr, fp),
|
|
struct _reent *rptr _AND
|
|
register FILE *fp)
|
|
{
|
|
register int i;
|
|
register unsigned char *p;
|
|
|
|
if (fp->_ub._base == fp->_ubuf)
|
|
{
|
|
/*
|
|
* Get a new buffer (rather than expanding the old one).
|
|
*/
|
|
if ((p = (unsigned char *) _malloc_r (rptr, (size_t) BUFSIZ)) == NULL)
|
|
return EOF;
|
|
fp->_ub._base = p;
|
|
fp->_ub._size = BUFSIZ;
|
|
p += BUFSIZ - sizeof (fp->_ubuf);
|
|
for (i = sizeof (fp->_ubuf); --i >= 0;)
|
|
p[i] = fp->_ubuf[i];
|
|
fp->_p = p;
|
|
return 0;
|
|
}
|
|
i = fp->_ub._size;
|
|
p = (unsigned char *) _realloc_r (rptr, (_PTR) (fp->_ub._base), i << 1);
|
|
if (p == NULL)
|
|
return EOF;
|
|
_CAST_VOID memcpy ((_PTR) (p + i), (_PTR) p, (size_t) i);
|
|
fp->_p = p + i;
|
|
fp->_ub._base = p;
|
|
fp->_ub._size = i << 1;
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
_DEFUN(_ungetc_r, (rptr, c, fp),
|
|
struct _reent *rptr _AND
|
|
int c _AND
|
|
register FILE *fp)
|
|
{
|
|
if (c == EOF)
|
|
return (EOF);
|
|
|
|
/* Ensure stdio has been initialized.
|
|
??? Might be able to remove this as some other stdio routine should
|
|
have already been called to get the char we are un-getting. */
|
|
|
|
CHECK_INIT (rptr);
|
|
|
|
_flockfile (fp);
|
|
|
|
/* After ungetc, we won't be at eof anymore */
|
|
fp->_flags &= ~__SEOF;
|
|
|
|
if ((fp->_flags & __SRD) == 0)
|
|
{
|
|
/*
|
|
* Not already reading: no good unless reading-and-writing.
|
|
* Otherwise, flush any current write stuff.
|
|
*/
|
|
if ((fp->_flags & __SRW) == 0)
|
|
{
|
|
_funlockfile (fp);
|
|
return EOF;
|
|
}
|
|
if (fp->_flags & __SWR)
|
|
{
|
|
if (fflush (fp))
|
|
{
|
|
_funlockfile (fp);
|
|
return EOF;
|
|
}
|
|
fp->_flags &= ~__SWR;
|
|
fp->_w = 0;
|
|
fp->_lbfsize = 0;
|
|
}
|
|
fp->_flags |= __SRD;
|
|
}
|
|
c = (unsigned char) c;
|
|
|
|
/*
|
|
* If we are in the middle of ungetc'ing, just continue.
|
|
* This may require expanding the current ungetc buffer.
|
|
*/
|
|
|
|
if (HASUB (fp))
|
|
{
|
|
if (fp->_r >= fp->_ub._size && __submore (rptr, fp))
|
|
{
|
|
_funlockfile (fp);
|
|
return EOF;
|
|
}
|
|
*--fp->_p = c;
|
|
fp->_r++;
|
|
_funlockfile (fp);
|
|
return c;
|
|
}
|
|
|
|
/*
|
|
* If we can handle this by simply backing up, do so,
|
|
* but never replace the original character.
|
|
* (This makes sscanf() work when scanning `const' data.)
|
|
*/
|
|
|
|
if (fp->_bf._base != NULL && fp->_p > fp->_bf._base && fp->_p[-1] == c)
|
|
{
|
|
fp->_p--;
|
|
fp->_r++;
|
|
_funlockfile (fp);
|
|
return c;
|
|
}
|
|
|
|
/*
|
|
* Create an ungetc buffer.
|
|
* Initially, we will use the `reserve' buffer.
|
|
*/
|
|
|
|
fp->_ur = fp->_r;
|
|
fp->_up = fp->_p;
|
|
fp->_ub._base = fp->_ubuf;
|
|
fp->_ub._size = sizeof (fp->_ubuf);
|
|
fp->_ubuf[sizeof (fp->_ubuf) - 1] = c;
|
|
fp->_p = &fp->_ubuf[sizeof (fp->_ubuf) - 1];
|
|
fp->_r = 1;
|
|
_funlockfile (fp);
|
|
return c;
|
|
}
|
|
|
|
#ifndef _REENT_ONLY
|
|
int
|
|
_DEFUN(ungetc, (c, fp),
|
|
int c _AND
|
|
register FILE *fp)
|
|
{
|
|
return _ungetc_r (_REENT, c, fp);
|
|
}
|
|
#endif /* !_REENT_ONLY */
|
|
|