diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2012-05-30 08:58:42 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2012-05-30 08:58:42 +0000 |
| commit | 4aa28d8ae279329f2b46c92e05b0bf457f07b9af (patch) | |
| tree | ff4d1723c92ad0f708643f70125baf16e2beaf49 /newlib/libc/stdio/vfprintf.c | |
| parent | 75b6133098753a31b722f94b86e95b11323735f0 (diff) | |
| download | cygnal-4aa28d8ae279329f2b46c92e05b0bf457f07b9af.tar.gz cygnal-4aa28d8ae279329f2b46c92e05b0bf457f07b9af.tar.bz2 cygnal-4aa28d8ae279329f2b46c92e05b0bf457f07b9af.zip | |
* 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.
Diffstat (limited to 'newlib/libc/stdio/vfprintf.c')
| -rw-r--r-- | newlib/libc/stdio/vfprintf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c index e3fc099d3..559899107 100644 --- a/newlib/libc/stdio/vfprintf.c +++ b/newlib/libc/stdio/vfprintf.c @@ -708,20 +708,20 @@ _DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap), #ifndef STRING_ONLY /* Initialize std streams if not dealing with sprintf family. */ CHECK_INIT (data, fp); - _flockfile (fp); + _newlib_flockfile_start (fp); ORIENT(fp, -1); /* sorry, fprintf(read_only_file, "") returns EOF, not 0 */ if (cantwrite (data, fp)) { - _funlockfile (fp); + _newlib_flockfile_exit (fp); return (EOF); } /* optimise fprintf(stderr) (and other unbuffered Unix files) */ if ((fp->_flags & (__SNBF|__SWR|__SRW)) == (__SNBF|__SWR) && fp->_file >= 0) { - _funlockfile (fp); + _newlib_flockfile_exit (fp); return (__sbprintf (data, fp, fmt0, ap)); } #else /* STRING_ONLY */ @@ -1633,7 +1633,7 @@ error: if (malloc_buf != NULL) _free_r (data, malloc_buf); #ifndef STRING_ONLY - _funlockfile (fp); + _newlib_flockfile_end (fp); #endif return (__sferror (fp) ? EOF : ret); /* NOTREACHED */ |