summaryrefslogtreecommitdiffstats
path: root/newlib/libc/stdio/gets.c
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2011-01-28 10:49:11 +0000
committerCorinna Vinschen <corinna@vinschen.de>2011-01-28 10:49:11 +0000
commit656df313e08a9ac4ef33c553285bb52d23c3e15f (patch)
tree5288836d1861c764410741e9b300ce21c3627aba /newlib/libc/stdio/gets.c
parentb5ca0d72711a691b733e64a7ea8cb93ef1d8d98e (diff)
downloadcygnal-656df313e08a9ac4ef33c553285bb52d23c3e15f.tar.gz
cygnal-656df313e08a9ac4ef33c553285bb52d23c3e15f.tar.bz2
cygnal-656df313e08a9ac4ef33c553285bb52d23c3e15f.zip
* 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.
Diffstat (limited to 'newlib/libc/stdio/gets.c')
-rw-r--r--newlib/libc/stdio/gets.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/newlib/libc/stdio/gets.c b/newlib/libc/stdio/gets.c
index daa42e954..17d144316 100644
--- a/newlib/libc/stdio/gets.c
+++ b/newlib/libc/stdio/gets.c
@@ -79,14 +79,12 @@ _DEFUN(_gets_r, (ptr, buf),
register int c;
register char *s = buf;
- __sfp_lock_acquire ();
_flockfile (stdin);
while ((c = __sgetc_r (ptr, stdin)) != '\n')
if (c == EOF)
if (s == buf)
{
_funlockfile (stdin);
- __sfp_lock_release ();
return NULL;
}
else
@@ -95,7 +93,6 @@ _DEFUN(_gets_r, (ptr, buf),
*s++ = c;
*s = 0;
_funlockfile (stdin);
- __sfp_lock_release ();
return buf;
}