From 10dcf7e718e250e222f00bc648c9cb43100edf88 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Thu, 25 Mar 2004 22:29:18 +0000 Subject: 2004-03-25 Thomas Pfaff * libc/stdio/fclose.c (fclose): Protect file pointer list when releasing a file. * libc/stdio/fcloseall.c (_fcloseall_r): Close all files via fwalk. * libc/stdio/fdopen.c (_fdopen_r): Add calls to _flockfile/_funlockfile. * libc/stdio/findfp.c: Move __sfp_lock. Change __sfp_lock type to recursive. Change __lock_acquire/__lock_release calls for __sfp_lock to __sfp_lock_acquire/__sfp_lock_release throughout. (std): Make sure that file lock is only initialized once. (__sfp): Move _file initialization. Initialize file lock. (__sfp_lock_acquire): New function. (__sfp_lock_release): Ditto. (__fp_lock_all): Remove __sfp_lock_acquire call. (__fp_unlock_all): Remove __sfp_lock_release call. * libc/stdio/fopen.c (_fopen_r): Protect file pointer list. Add calls to _flockfile/_funlockfile. Remove __lock_init_recursive call. * libc/stdio/freopen.c (_freopen_r): Protect file pointer list. * libc/stdio/fwalk.c (__fwalk): New static function. (_fwalk): Protect file pointer list. Use __fwalk to walk through file pointers. * libc/stdio/local.h: Add defines for __sfp_lock_acquire/__sfp_lock_release when single threaded. Add function prototypes otherwise. * libc/stdio64/fdopen64.c (_fdopen64_r): Add calls to _flockfile/_funlockfile. * libc/stdio/fopen64.c (_fopen64_r): Protect file pointer list. Add calls to _flockfile/_funlockfile. Remove __lock_init_recursive call. * libc/stdio/freopen64.c (_freopen64_r): Protect file pointer list. --- newlib/libc/stdio/fclose.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'newlib/libc/stdio/fclose.c') diff --git a/newlib/libc/stdio/fclose.c b/newlib/libc/stdio/fclose.c index 1caeb4cde..a125f16ef 100644 --- a/newlib/libc/stdio/fclose.c +++ b/newlib/libc/stdio/fclose.c @@ -65,6 +65,8 @@ _DEFUN (fclose, (fp), if (fp == NULL) return (0); /* on NULL */ + __sfp_lock_acquire (); + _flockfile(fp); CHECK_INIT (fp); @@ -72,6 +74,7 @@ _DEFUN (fclose, (fp), if (fp->_flags == 0) /* not open! */ { _funlockfile(fp); + __sfp_lock_release (); return (0); } r = fp->_flags & __SWR ? fflush (fp) : 0; @@ -83,11 +86,13 @@ _DEFUN (fclose, (fp), FREEUB (fp); if (HASLB (fp)) FREELB (fp); + fp->_flags = 0; /* release this FILE for reuse */ _funlockfile(fp); #ifndef __SINGLE_THREAD__ __lock_close_recursive (*(_LOCK_RECURSIVE_T *)&fp->_lock); #endif - fp->_flags = 0; /* release this FILE for reuse */ + + __sfp_lock_release (); return (r); } -- cgit v1.2.3