* 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/ftell.c b/newlib/libc/stdio/ftell.c
index 816cafa76..54a656c09 100644
--- a/newlib/libc/stdio/ftell.c
+++ b/newlib/libc/stdio/ftell.c
@@ -109,12 +109,12 @@ _DEFUN(_ftell_r, (ptr, fp),
 
   CHECK_INIT (ptr, fp);
 
-  _flockfile (fp);
+  _newlib_flockfile_start (fp);
 
   if (fp->_seek == NULL)
     {
       ptr->_errno = ESPIPE;
-      _funlockfile (fp);
+      _newlib_flockfile_exit (fp);
       return -1L;
     }
 
@@ -131,7 +131,7 @@ _DEFUN(_ftell_r, (ptr, fp),
       pos = fp->_seek (ptr, fp->_cookie, (_fpos_t) 0, SEEK_CUR);
       if (pos == -1L)
         {
-          _funlockfile (fp);
+          _newlib_flockfile_exit (fp);
           return pos;
         }
     }
@@ -156,7 +156,7 @@ _DEFUN(_ftell_r, (ptr, fp),
       pos += fp->_p - fp->_bf._base;
     }
 
-  _funlockfile (fp);
+  _newlib_flockfile_end (fp);
   if ((long)pos != pos)
     {
       pos = -1;