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/fread.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'newlib/libc/stdio/fread.c') diff --git a/newlib/libc/stdio/fread.c b/newlib/libc/stdio/fread.c index a39e9d85f..07fe0af5c 100644 --- a/newlib/libc/stdio/fread.c +++ b/newlib/libc/stdio/fread.c @@ -146,7 +146,7 @@ _DEFUN(_fread_r, (ptr, buf, size, count, fp), CHECK_INIT(ptr, fp); - _flockfile (fp); + _newlib_flockfile_start (fp); ORIENT (fp, -1); if (fp->_r < 0) fp->_r = 0; @@ -195,11 +195,11 @@ _DEFUN(_fread_r, (ptr, buf, size, count, fp), #ifdef __SCLE if (fp->_flags & __SCLE) { - _funlockfile (fp); + _newlib_flockfile_exit (fp); return crlf_r (ptr, fp, buf, total-resid, 1) / size; } #endif - _funlockfile (fp); + _newlib_flockfile_exit (fp); return (total - resid) / size; } } @@ -220,11 +220,11 @@ _DEFUN(_fread_r, (ptr, buf, size, count, fp), #ifdef __SCLE if (fp->_flags & __SCLE) { - _funlockfile (fp); + _newlib_flockfile_exit (fp); return crlf_r (ptr, fp, buf, total-resid, 1) / size; } #endif - _funlockfile (fp); + _newlib_flockfile_exit (fp); return (total - resid) / size; } } @@ -237,11 +237,11 @@ _DEFUN(_fread_r, (ptr, buf, size, count, fp), #ifdef __SCLE if (fp->_flags & __SCLE) { - _funlockfile (fp); + _newlib_flockfile_exit (fp); return crlf_r(ptr, fp, buf, total, 0) / size; } #endif - _funlockfile (fp); + _newlib_flockfile_end (fp); return count; } -- cgit v1.2.3