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.
120 lines
2.7 KiB
C
120 lines
2.7 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.
|
|
*/
|
|
|
|
/*
|
|
FUNCTION
|
|
<<fclose>>---close a file
|
|
|
|
INDEX
|
|
fclose
|
|
INDEX
|
|
_fclose_r
|
|
|
|
ANSI_SYNOPSIS
|
|
#include <stdio.h>
|
|
int fclose(FILE *<[fp]>);
|
|
int _fclose_r(struct _reent *<[reent]>, FILE *<[fp]>);
|
|
|
|
TRAD_SYNOPSIS
|
|
#include <stdio.h>
|
|
int fclose(<[fp]>)
|
|
FILE *<[fp]>;
|
|
|
|
int fclose(<[fp]>)
|
|
struct _reent *<[reent]>
|
|
FILE *<[fp]>;
|
|
|
|
DESCRIPTION
|
|
If the file or stream identified by <[fp]> is open, <<fclose>> closes
|
|
it, after first ensuring that any pending data is written (by calling
|
|
<<fflush(<[fp]>)>>).
|
|
|
|
The alternate function <<_fclose_r>> is a reentrant version.
|
|
The extra argument <[reent]> is a pointer to a reentrancy structure.
|
|
|
|
RETURNS
|
|
<<fclose>> returns <<0>> if successful (including when <[fp]> is
|
|
<<NULL>> or not an open file); otherwise, it returns <<EOF>>.
|
|
|
|
PORTABILITY
|
|
<<fclose>> is required by ANSI C.
|
|
|
|
Required OS subroutines: <<close>>, <<fstat>>, <<isatty>>, <<lseek>>,
|
|
<<read>>, <<sbrk>>, <<write>>.
|
|
*/
|
|
|
|
#include <_ansi.h>
|
|
#include <reent.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <sys/lock.h>
|
|
#include "local.h"
|
|
|
|
int
|
|
_DEFUN(_fclose_r, (rptr, fp),
|
|
struct _reent *rptr _AND
|
|
register FILE * fp)
|
|
{
|
|
int r;
|
|
|
|
if (fp == NULL)
|
|
return (0); /* on NULL */
|
|
|
|
__sfp_lock_acquire ();
|
|
|
|
CHECK_INIT (rptr);
|
|
|
|
_flockfile (fp);
|
|
|
|
if (fp->_flags == 0) /* not open! */
|
|
{
|
|
_funlockfile (fp);
|
|
__sfp_lock_release ();
|
|
return (0);
|
|
}
|
|
r = fp->_flags & __SWR ? fflush (fp) : 0;
|
|
if (fp->_close != NULL && (*fp->_close) (fp->_cookie) < 0)
|
|
r = EOF;
|
|
if (fp->_flags & __SMBF)
|
|
_free_r (rptr, (char *) fp->_bf._base);
|
|
if (HASUB (fp))
|
|
FREEUB (fp);
|
|
if (HASLB (fp))
|
|
FREELB (fp);
|
|
fp->_flags = 0; /* release this FILE for reuse */
|
|
_funlockfile (fp);
|
|
#ifndef __SINGLE_THREAD__
|
|
__lock_close_recursive (fp->_lock);
|
|
#endif
|
|
|
|
__sfp_lock_release ();
|
|
|
|
return (r);
|
|
}
|
|
|
|
#ifndef _REENT_ONLY
|
|
|
|
int
|
|
_DEFUN(fclose, (fp),
|
|
register FILE * fp)
|
|
{
|
|
return _fclose_r(_REENT, fp);
|
|
}
|
|
|
|
#endif
|
|
|