summaryrefslogtreecommitdiffstats
path: root/newlib/libc/stdio/fdopen.c
diff options
context:
space:
mode:
authorJeff Johnston <jjohnstn@redhat.com>2004-03-25 22:29:18 +0000
committerJeff Johnston <jjohnstn@redhat.com>2004-03-25 22:29:18 +0000
commit10dcf7e718e250e222f00bc648c9cb43100edf88 (patch)
tree1cc4e335de067dd59ad3391266a0f4bd5e0e4018 /newlib/libc/stdio/fdopen.c
parent4ee0dce2d7b81143c6b7ca5d8746ee3705f02ec4 (diff)
downloadcygnal-10dcf7e718e250e222f00bc648c9cb43100edf88.tar.gz
cygnal-10dcf7e718e250e222f00bc648c9cb43100edf88.tar.bz2
cygnal-10dcf7e718e250e222f00bc648c9cb43100edf88.zip
2004-03-25 Thomas Pfaff <tpfaff@gmx.net>
* 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.
Diffstat (limited to 'newlib/libc/stdio/fdopen.c')
-rw-r--r--newlib/libc/stdio/fdopen.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/newlib/libc/stdio/fdopen.c b/newlib/libc/stdio/fdopen.c
index 0db6062dd..8c1555d34 100644
--- a/newlib/libc/stdio/fdopen.c
+++ b/newlib/libc/stdio/fdopen.c
@@ -76,6 +76,9 @@ _DEFUN (_fdopen_r, (ptr, fd, mode),
if ((fp = __sfp (ptr)) == 0)
return 0;
+
+ _flockfile(fp);
+
fp->_flags = flags;
/*
* If opened for appending, but underlying descriptor
@@ -111,6 +114,7 @@ _DEFUN (_fdopen_r, (ptr, fd, mode),
fp->_flags |= __SCLE;
#endif
+ _funlockfile(fp);
return fp;
}