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/fgets.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/fgets.c')
| -rw-r--r-- | newlib/libc/stdio/fgets.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/newlib/libc/stdio/fgets.c b/newlib/libc/stdio/fgets.c index 7f02e3f..1644fba 100644 --- a/newlib/libc/stdio/fgets.c +++ b/newlib/libc/stdio/fgets.c @@ -98,7 +98,7 @@ _DEFUN(_fgets_r, (ptr, buf, n, fp), CHECK_INIT(ptr, fp); - _flockfile (fp); + _newlib_flockfile_start (fp); #ifdef __SCLE if (fp->_flags & __SCLE) { @@ -112,11 +112,11 @@ _DEFUN(_fgets_r, (ptr, buf, n, fp), } if (c == EOF && s == buf) { - _funlockfile (fp); + _newlib_flockfile_exit (fp); return NULL; } *s = 0; - _funlockfile (fp); + _newlib_flockfile_exit (fp); return buf; } #endif @@ -134,7 +134,7 @@ _DEFUN(_fgets_r, (ptr, buf, n, fp), /* EOF: stop with partial or no line */ if (s == buf) { - _funlockfile (fp); + _newlib_flockfile_exit (fp); return 0; } break; @@ -159,7 +159,7 @@ _DEFUN(_fgets_r, (ptr, buf, n, fp), fp->_p = t; _CAST_VOID memcpy ((_PTR) s, (_PTR) p, len); s[len] = 0; - _funlockfile (fp); + _newlib_flockfile_exit (fp); return (buf); } fp->_r -= len; @@ -169,7 +169,7 @@ _DEFUN(_fgets_r, (ptr, buf, n, fp), } while ((n -= len) != 0); *s = 0; - _funlockfile (fp); + _newlib_flockfile_end (fp); return buf; } |