diff options
Diffstat (limited to 'newlib/libc/stdio64/freopen64.c')
| -rw-r--r-- | newlib/libc/stdio64/freopen64.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/newlib/libc/stdio64/freopen64.c b/newlib/libc/stdio64/freopen64.c index 1e2ec7827..db0e1ee0f 100644 --- a/newlib/libc/stdio64/freopen64.c +++ b/newlib/libc/stdio64/freopen64.c @@ -100,11 +100,20 @@ _DEFUN (_freopen64_r, (ptr, file, mode, fp), CHECK_INIT (ptr, fp); - _flockfile(fp); + /* We can't use the _newlib_flockfile_XXX macros here due to the + interlocked locking with the sfp_lock. */ +#if !defined (__SINGLE_THREAD__) && defined (_POSIX_THREADS) + int __oldcancel; + pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &__oldcancel); +#endif + _flockfile (fp); if ((flags = __sflags (ptr, mode, &oflags)) == 0) { - _funlockfile(fp); + _funlockfile (fp); +#if !defined (__SINGLE_THREAD__) && defined (_POSIX_THREADS) + pthread_setcancelstate (__oldcancel, &__oldcancel); +#endif _fclose_r (ptr, fp); return NULL; } @@ -205,11 +214,14 @@ _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); + _funlockfile (fp); #ifndef __SINGLE_THREAD__ __lock_close_recursive (fp->_lock); #endif __sfp_lock_release (); +#if !defined (__SINGLE_THREAD__) && defined (_POSIX_THREADS) + pthread_setcancelstate (__oldcancel, &__oldcancel); +#endif return NULL; } @@ -229,7 +241,10 @@ _DEFUN (_freopen64_r, (ptr, file, mode, fp), fp->_flags |= __SL64; - _funlockfile(fp); + _funlockfile (fp); +#if !defined (__SINGLE_THREAD__) && defined (_POSIX_THREADS) + pthread_setcancelstate (__oldcancel, &__oldcancel); +#endif return fp; } |