* 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.

1 files changed, 4 insertions, 4 deletions

diff --git a/newlib/libc/stdio/fgetc.c b/newlib/libc/stdio/fgetc.c
index e275cfeeb..99d8330fe 100644
--- a/newlib/libc/stdio/fgetc.c
+++ b/newlib/libc/stdio/fgetc.c
@@ -78,9 +78,9 @@ _DEFUN(_fgetc_r, (ptr, fp),
 {
   int result;
   CHECK_INIT(ptr, fp);
-  _flockfile (fp);
+  _newlib_flockfile_start (fp);
   result = __sgetc_r (ptr, fp);
-  _funlockfile (fp);
+  _newlib_flockfile_end (fp);
   return result;
 }
 
@@ -93,9 +93,9 @@ _DEFUN(fgetc, (fp),
 #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
   int result;
   CHECK_INIT(_REENT, fp);
-  _flockfile (fp);
+  _newlib_flockfile_start (fp);
   result = __sgetc_r (_REENT, fp);
-  _funlockfile (fp);
+  _newlib_flockfile_end (fp);
   return result;
 #else
   return _fgetc_r (_REENT, fp);