From 656df313e08a9ac4ef33c553285bb52d23c3e15f Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Fri, 28 Jan 2011 10:49:11 +0000
Subject: 	* libc/stdio/fclose.c: Only use sfp lock to guard non-atomic 
 changes of flags and fp lock. 	* libc/stdio/freopen.c: Ditto. 	*
 libc/stdio/freopen64.c: Ditto. 	* libc/stdio/fgetc.c: Revert change
 from 2009-04-24, remove sfp locks 	which guard entire function to avoid
 potential deadlocks when using 	stdio functions in multiple thraeds. 
 * libc/stdio/fgets.c: Ditto. 	* libc/stdio/fgetwc.c: Ditto. 	*
 libc/stdio/fgetws.c: Ditto. 	* libc/stdio/fread.c: Ditto. 	*
 libc/stdio/fseek.c: Ditto. 	* libc/stdio/getc.c: Ditto. 	*
 libc/stdio/getdelim.c: Ditto. 	* libc/stdio/gets.c: Ditto. 	*
 libc/stdio/vfscanf.c: Ditto. 	* libc/stdio/vfwscanf.c: Ditto.

	* libc/stdio/fflush.c (_fflush_r): Split out core functionality into
	new function __sflush_r.  Just lock file and call __sflush_r from here.
	* libc/stdio/fwalk.c (_fwalk): Remove static helper function and move
	functionality back into main function. Don't walk a file with flags
	value of 1.  Add comment.
	(_fwalk_reent): Ditto.
	* libc/stdio/local.h (__sflush_r): Declare.
	* libc/stdio/refill.c (__srefill): Before calling fwalk, set flags
	value to 1 so this file pointer isn't walked.  Revert flags afterwards
	and call __sflush_r for this fp if necessary.  Add comments.
---
 newlib/libc/stdio/fgets.c | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'newlib/libc/stdio/fgets.c')

diff --git a/newlib/libc/stdio/fgets.c b/newlib/libc/stdio/fgets.c
index 21bfdd4c6..7f02e3fcb 100644
--- a/newlib/libc/stdio/fgets.c
+++ b/newlib/libc/stdio/fgets.c
@@ -98,7 +98,6 @@ _DEFUN(_fgets_r, (ptr, buf, n, fp),
 
   CHECK_INIT(ptr, fp);
 
-  __sfp_lock_acquire ();
   _flockfile (fp);
 #ifdef __SCLE
   if (fp->_flags & __SCLE)
@@ -114,12 +113,10 @@ _DEFUN(_fgets_r, (ptr, buf, n, fp),
       if (c == EOF && s == buf)
         {
           _funlockfile (fp);
-	  __sfp_lock_release ();
           return NULL;
         }
       *s = 0;
       _funlockfile (fp);
-      __sfp_lock_release ();
       return buf;
     }
 #endif
@@ -138,7 +135,6 @@ _DEFUN(_fgets_r, (ptr, buf, n, fp),
 	      if (s == buf)
                 {
                   _funlockfile (fp);
-		  __sfp_lock_release ();
                   return 0;
                 }
 	      break;
@@ -164,7 +160,6 @@ _DEFUN(_fgets_r, (ptr, buf, n, fp),
 	  _CAST_VOID memcpy ((_PTR) s, (_PTR) p, len);
 	  s[len] = 0;
           _funlockfile (fp);
-	  __sfp_lock_release ();
 	  return (buf);
 	}
       fp->_r -= len;
@@ -175,7 +170,6 @@ _DEFUN(_fgets_r, (ptr, buf, n, fp),
   while ((n -= len) != 0);
   *s = 0;
   _funlockfile (fp);
-  __sfp_lock_release ();
   return buf;
 }
 
-- 
cgit v1.2.3