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.
106 lines
3.6 KiB
C
106 lines
3.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.
|
|
*
|
|
* %W% (UofMD/Berkeley) %G%
|
|
*/
|
|
|
|
/*
|
|
* Information local to this implementation of stdio,
|
|
* in particular, macros and private variables.
|
|
*/
|
|
|
|
#include <_ansi.h>
|
|
#include <reent.h>
|
|
#include <stdarg.h>
|
|
#include <reent.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
|
|
extern int _EXFUN(__svfscanf_r,(struct _reent *,FILE *, _CONST char *,va_list));
|
|
extern int _EXFUN(__svfiscanf_r,(struct _reent *,FILE *, _CONST char *,va_list));
|
|
extern FILE *_EXFUN(__sfp,(struct _reent *));
|
|
extern int _EXFUN(__sflags,(struct _reent *,_CONST char*, int*));
|
|
extern int _EXFUN(__srefill,(FILE *));
|
|
extern _READ_WRITE_RETURN_TYPE _EXFUN(__sread,(_PTR, char *, int));
|
|
extern _READ_WRITE_RETURN_TYPE _EXFUN(__swrite,(_PTR, char _CONST *, int));
|
|
extern _fpos_t _EXFUN(__sseek,(_PTR, _fpos_t, int));
|
|
extern int _EXFUN(__sclose,(_PTR));
|
|
extern int _EXFUN(__stextmode,(int));
|
|
extern _VOID _EXFUN(__sinit,(struct _reent *));
|
|
extern _VOID _EXFUN(_cleanup_r,(struct _reent *));
|
|
extern _VOID _EXFUN(__smakebuf,(FILE *));
|
|
extern int _EXFUN(_fwalk,(struct _reent *, int (*)(FILE *)));
|
|
extern int _EXFUN(_fwalk_reent,(struct _reent *, int (*)(struct _reent *, FILE *)));
|
|
struct _glue * _EXFUN(__sfmoreglue,(struct _reent *,int n));
|
|
extern int _EXFUN(__srefill,(FILE *fp));
|
|
|
|
/* Called by the main entry point fns to ensure stdio has been initialized. */
|
|
|
|
#define CHECK_INIT(ptr) \
|
|
do \
|
|
{ \
|
|
if ((ptr) && !(ptr)->__sdidinit) \
|
|
__sinit (ptr); \
|
|
} \
|
|
while (0)
|
|
|
|
/* Return true iff the given FILE cannot be written now. */
|
|
|
|
#define cantwrite(fp) \
|
|
((((fp)->_flags & __SWR) == 0 || (fp)->_bf._base == NULL) && \
|
|
__swsetup(fp))
|
|
|
|
/* Test whether the given stdio file has an active ungetc buffer;
|
|
release such a buffer, without restoring ordinary unread data. */
|
|
|
|
#define HASUB(fp) ((fp)->_ub._base != NULL)
|
|
#define FREEUB(fp) { \
|
|
if ((fp)->_ub._base != (fp)->_ubuf) \
|
|
_free_r(_REENT, (char *)(fp)->_ub._base); \
|
|
(fp)->_ub._base = NULL; \
|
|
}
|
|
|
|
/* Test for an fgetline() buffer. */
|
|
|
|
#define HASLB(fp) ((fp)->_lb._base != NULL)
|
|
#define FREELB(fp) { _free_r(_REENT,(char *)(fp)->_lb._base); (fp)->_lb._base = NULL; }
|
|
|
|
/* WARNING: _dcvt is defined in the stdlib directory, not here! */
|
|
|
|
char *_EXFUN(_dcvt,(struct _reent *, char *, double, int, int, char, int));
|
|
char *_EXFUN(_sicvt,(char *, short, char));
|
|
char *_EXFUN(_icvt,(char *, int, char));
|
|
char *_EXFUN(_licvt,(char *, long, char));
|
|
#ifdef __GNUC__
|
|
char *_EXFUN(_llicvt,(char *, long long, char));
|
|
#endif
|
|
|
|
#define CVT_BUF_SIZE 128
|
|
|
|
#define NDYNAMIC 4 /* add four more whenever necessary */
|
|
|
|
#ifdef __SINGLE_THREAD__
|
|
#define __sfp_lock_acquire()
|
|
#define __sfp_lock_release()
|
|
#define __sinit_lock_acquire()
|
|
#define __sinit_lock_release()
|
|
#else
|
|
_VOID _EXFUN(__sfp_lock_acquire,(_VOID));
|
|
_VOID _EXFUN(__sfp_lock_release,(_VOID));
|
|
_VOID _EXFUN(__sinit_lock_acquire,(_VOID));
|
|
_VOID _EXFUN(__sinit_lock_release,(_VOID));
|
|
#endif
|