diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2012-05-30 08:58:42 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2012-05-30 08:58:42 +0000 |
| commit | 4aa28d8ae279329f2b46c92e05b0bf457f07b9af (patch) | |
| tree | ff4d1723c92ad0f708643f70125baf16e2beaf49 /newlib/libc/stdio/fread.c | |
| parent | 75b6133098753a31b722f94b86e95b11323735f0 (diff) | |
| download | newlib-4aa28d8ae279329f2b46c92e05b0bf457f07b9af.zip newlib-4aa28d8ae279329f2b46c92e05b0bf457f07b9af.tar.gz newlib-4aa28d8ae279329f2b46c92e05b0bf457f07b9af.tar.bz2 | |
* 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/fread.c')
| -rw-r--r-- | newlib/libc/stdio/fread.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/newlib/libc/stdio/fread.c b/newlib/libc/stdio/fread.c index a39e9d8..07fe0af 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; } |