* 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/fputc.c b/newlib/libc/stdio/fputc.c
index 777a34242..6af79d470 100644
--- a/newlib/libc/stdio/fputc.c
+++ b/newlib/libc/stdio/fputc.c
@@ -83,9 +83,9 @@ _DEFUN(_fputc_r, (ptr, ch, file),
 {
   int result;
   CHECK_INIT(ptr, file);
-   _flockfile (file);
+   _newlib_flockfile_start (file);
   result = _putc_r (ptr, ch, file);
-  _funlockfile (file);
+  _newlib_flockfile_end (file);
   return result;
 }
 
@@ -98,9 +98,9 @@ _DEFUN(fputc, (ch, file),
 #if !defined(__OPTIMIZE_SIZE__) && !defined(PREFER_SIZE_OVER_SPEED)
   int result;
   CHECK_INIT(_REENT, file);
-   _flockfile (file);
+   _newlib_flockfile_start (file);
   result = _putc_r (_REENT, ch, file);
-  _funlockfile (file);
+  _newlib_flockfile_end (file);
   return result;
 #else
   return _fputc_r (_REENT, ch, file);