diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2012-05-30 12:58:42 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2012-05-30 12:58:42 +0400 |
| commit | 4aa28d8ae279329f2b46c92e05b0bf457f07b9af (patch) | |
| tree | ff4d1723c92ad0f708643f70125baf16e2beaf49 /newlib/libc/stdio/funopen.c | |
| parent | 75b6133098753a31b722f94b86e95b11323735f0 (diff) | |
* libc/stdio/local.h (_newlib_flockfile_start): New macro to
secure stream related critical section against thread cancellation.
(_newlib_flockfile_exit): Ditto.
(_newlib_sfp_lock_end): Ditto.
(_newlib_sfp_lock_start): Ditto for the list of streams.
(_newlib_sfp_lock_exit): Ditto.
(_newlib_sfp_lock_end): Ditto.
Use aforementioned macros in place of _flockfile/_funlockfile
and __sfp_lock_acquire/__sfp_lock_release throughout the code.
* libc/stdio/fclose.c: Explicitely disable and re-enable thread
cancellation. Explain why.
* libc/stdio/freopen.c: Ditto.
* libc/stdio64/freopen64.c: Ditto.
Diffstat (limited to 'newlib/libc/stdio/funopen.c')
| -rw-r--r-- | newlib/libc/stdio/funopen.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/newlib/libc/stdio/funopen.c b/newlib/libc/stdio/funopen.c index 35a274f7b..065ed93d7 100644 --- a/newlib/libc/stdio/funopen.c +++ b/newlib/libc/stdio/funopen.c @@ -214,16 +214,16 @@ _DEFUN(_funopen_r, (ptr, cookie, readfn, writefn, seekfn, closefn), return NULL; if ((c = (funcookie *) _malloc_r (ptr, sizeof *c)) == NULL) { - __sfp_lock_acquire (); + _newlib_sfp_lock_start (); fp->_flags = 0; /* release */ #ifndef __SINGLE_THREAD__ __lock_close_recursive (fp->_lock); #endif - __sfp_lock_release (); + _newlib_sfp_lock_end (); return NULL; } - _flockfile (fp); + _newlib_flockfile_start (fp); fp->_file = -1; c->cookie = (void *) cookie; /* cast away const */ fp->_cookie = c; @@ -260,7 +260,7 @@ _DEFUN(_funopen_r, (ptr, cookie, readfn, writefn, seekfn, closefn), #endif c->closefn = closefn; fp->_close = funcloser; - _funlockfile (fp); + _newlib_flockfile_end (fp); return fp; } |