* 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/stdio64/ftello64.c b/newlib/libc/stdio64/ftello64.c
index 51dcd2796..c4d6da24b 100644
--- a/newlib/libc/stdio64/ftello64.c
+++ b/newlib/libc/stdio64/ftello64.c
@@ -99,12 +99,12 @@ _DEFUN (_ftello64_r, (ptr, fp),
 
   CHECK_INIT (ptr, fp);
 
-  _flockfile(fp);
+  _newlib_flockfile_start(fp);
 
   if (fp->_seek64 == NULL)
     {
       ptr->_errno = ESPIPE;
-      _funlockfile(fp);
+      _newlib_flockfile_exit(fp);
       return -1L;
     }
 
@@ -121,7 +121,7 @@ _DEFUN (_ftello64_r, (ptr, fp),
       pos = fp->_seek64 (ptr, fp->_cookie, (_fpos64_t) 0, SEEK_CUR);
       if (pos == -1L)
         {
-          _funlockfile(fp);
+          _newlib_flockfile_exit(fp);
           return pos;
         }
     }
@@ -146,7 +146,7 @@ _DEFUN (_ftello64_r, (ptr, fp),
       pos += fp->_p - fp->_bf._base;
     }
 
-  _funlockfile(fp);
+  _newlib_flockfile_end(fp);
   return pos;
 }