diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2015-12-08 23:23:22 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2015-12-08 23:23:22 +0300 |
| commit | 91a8eacec6575a3a2c6aa4c4cf26961870f6074a (patch) | |
| tree | f5eddf39c5d7e22f148092859eeef55f141ae332 /newlib/libc/stdio64 | |
| parent | 414e7948118bb3b7071e7c8cbddcf371e0d48e38 (diff) | |
Add missing checks for __SNLK flag
* libc/stdio/fclose.c (_fclose_r): Make _flockfile/_funlockfile calls
dependent on __SNLK flag.
* libc/stdio/findfp.c (__fp_lock): Ditto.
(__fp_unlock): Ditto.
* libc/stdio/freopen.c (_freopen_r): Ditto.
* libc/stdio64/freopen64.c (_freopen64_r): Ditto.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'newlib/libc/stdio64')
| -rw-r--r-- | newlib/libc/stdio64/freopen64.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/newlib/libc/stdio64/freopen64.c b/newlib/libc/stdio64/freopen64.c index a183fb8ea..8a069d53e 100644 --- a/newlib/libc/stdio64/freopen64.c +++ b/newlib/libc/stdio64/freopen64.c @@ -94,7 +94,7 @@ _DEFUN (_freopen64_r, (ptr, file, mode, fp), register FILE *fp) { register int f; - int flags, oflags; + int flags, oflags, oflags2; int e = 0; @@ -106,11 +106,14 @@ _DEFUN (_freopen64_r, (ptr, file, mode, fp), int __oldcancel; pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &__oldcancel); #endif - _flockfile (fp); + oflags2 = fp->_flags2; + if (!(oflags2 & __SNLK)) + _flockfile (fp); if ((flags = __sflags (ptr, mode, &oflags)) == 0) { - _funlockfile (fp); + if (!(oflags2 & __SNLK)) + _funlockfile (fp); #ifdef _STDIO_WITH_THREAD_CANCELLATION_SUPPORT pthread_setcancelstate (__oldcancel, &__oldcancel); #endif @@ -217,7 +220,8 @@ _DEFUN (_freopen64_r, (ptr, file, mode, fp), __sfp_lock_acquire (); fp->_flags = 0; /* set it free */ ptr->_errno = e; /* restore in case _close clobbered */ - _funlockfile (fp); + if (!(oflags2 & __SNLK)) + _funlockfile (fp); #ifndef __SINGLE_THREAD__ __lock_close_recursive (fp->_lock); #endif @@ -244,7 +248,8 @@ _DEFUN (_freopen64_r, (ptr, file, mode, fp), fp->_flags |= __SL64; - _funlockfile (fp); + if (!(oflags2 & __SNLK)) + _funlockfile (fp); #if !defined (__SINGLE_THREAD__) && defined (_POSIX_THREADS) pthread_setcancelstate (__oldcancel, &__oldcancel); #endif |