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/fgets.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'newlib/libc/stdio/fgets.c') diff --git a/newlib/libc/stdio/fgets.c b/newlib/libc/stdio/fgets.c index 7f02e3fcb..1644fba6a 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; } -- cgit v1.2.3