From 4aa28d8ae279329f2b46c92e05b0bf457f07b9af Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 30 May 2012 08:58:42 +0000 Subject: * 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. --- newlib/libc/stdio/fpurge.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'newlib/libc/stdio/fpurge.c') diff --git a/newlib/libc/stdio/fpurge.c b/newlib/libc/stdio/fpurge.c index 7e23bb7fd..dc052e85b 100644 --- a/newlib/libc/stdio/fpurge.c +++ b/newlib/libc/stdio/fpurge.c @@ -68,13 +68,13 @@ _DEFUN(_fpurge_r, (ptr, fp), CHECK_INIT (ptr, fp); - _flockfile (fp); + _newlib_flockfile_start (fp); t = fp->_flags; if (!t) { ptr->_errno = EBADF; - _funlockfile (fp); + _newlib_flockfile_exit (fp); return EOF; } fp->_p = fp->_bf._base; @@ -86,7 +86,7 @@ _DEFUN(_fpurge_r, (ptr, fp), } else fp->_w = t & (__SLBF | __SNBF) ? 0 : fp->_bf._size; - _funlockfile (fp); + _newlib_flockfile_end (fp); return 0; } -- cgit v1.2.3