From 4aa28d8ae279329f2b46c92e05b0bf457f07b9af Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 30 May 2012 08:58:42 +0000 Subject: * 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. --- newlib/libc/stdio/gets.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'newlib/libc/stdio/gets.c') diff --git a/newlib/libc/stdio/gets.c b/newlib/libc/stdio/gets.c index 17d144316..f51d46196 100644 --- a/newlib/libc/stdio/gets.c +++ b/newlib/libc/stdio/gets.c @@ -70,6 +70,7 @@ Supporting OS subroutines required: <>, <>, <>, #include <_ansi.h> #include #include +#include "local.h" char * _DEFUN(_gets_r, (ptr, buf), @@ -79,12 +80,12 @@ _DEFUN(_gets_r, (ptr, buf), register int c; register char *s = buf; - _flockfile (stdin); + _newlib_flockfile_start (stdin); while ((c = __sgetc_r (ptr, stdin)) != '\n') if (c == EOF) if (s == buf) { - _funlockfile (stdin); + _newlib_flockfile_exit (stdin); return NULL; } else @@ -92,7 +93,7 @@ _DEFUN(_gets_r, (ptr, buf), else *s++ = c; *s = 0; - _funlockfile (stdin); + _newlib_flockfile_end (stdin); return buf; } -- cgit v1.2.3