JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add missing checks for __SNLK flag

Browse Source 
* 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>
This commit is contained in:
Corinna Vinschen 2015-12-08 21:23:22 +01:00
parent 414e794811
commit 91a8eacec6
5 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
newlib/ChangeLog
View File

@ -1,3 +1,12 @@
2015-12-08 Corinna Vinschen <corinna@vinschen.de>
* 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.
2015-12-08 Corinna Vinschen <corinna@vinschen.de>
* libc/stdio/freopen.c (_freopen_r): Only reset __SWID bit per SUSv4.

9
newlib/libc/stdio/fclose.c
View File

@ -82,11 +82,13 @@ _DEFUN(_fclose_r, (rptr, fp),
int __oldcancel;
pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &__oldcancel);
#endif
_flockfile (fp);
if (!(fp->_flags2 & __SNLK))
_flockfile (fp);
if (fp->_flags == 0) /* not open! */
{
_funlockfile (fp);
if (!(fp->_flags2 & __SNLK))
_funlockfile (fp);
#ifdef _STDIO_WITH_THREAD_CANCELLATION_SUPPORT
pthread_setcancelstate (__oldcancel, &__oldcancel);
#endif
@ -111,7 +113,8 @@ _DEFUN(_fclose_r, (rptr, fp),
FREELB (rptr, fp);
__sfp_lock_acquire ();
fp->_flags = 0; /* release this FILE for reuse */
_funlockfile (fp);
if (!(fp->_flags2 & __SNLK))
_funlockfile (fp);
#ifndef __SINGLE_THREAD__
__lock_close_recursive (fp->_lock);
#endif

6
newlib/libc/stdio/findfp.c
View File

@ -293,7 +293,8 @@ static int
_DEFUN(__fp_lock, (ptr),
FILE * ptr)
{
_flockfile (ptr);
if (!(ptr->_flags2 & __SNLK))
_flockfile (ptr);
return 0;
}
@ -303,7 +304,8 @@ static int
_DEFUN(__fp_unlock, (ptr),
FILE * ptr)
{
_funlockfile (ptr);
if (!(ptr->_flags2 & __SNLK))
_funlockfile (ptr);
return 0;
}

15
newlib/libc/stdio/freopen.c
View File

@ -95,7 +95,7 @@ _DEFUN(_freopen_r, (ptr, file, mode, fp),
register FILE *__restrict fp)
{
register int f;
int flags, oflags;
int flags, oflags, oflags2;
int e = 0;
CHECK_INIT (ptr, fp);
@ -106,11 +106,14 @@ _DEFUN(_freopen_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(_freopen_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
@ -241,7 +245,8 @@ _DEFUN(_freopen_r, (ptr, file, mode, fp),
fp->_flags |= __SCLE;
#endif
_funlockfile (fp);
if (!(oflags2 & __SNLK))
_funlockfile (fp);
#ifdef _STDIO_WITH_THREAD_CANCELLATION_SUPPORT
pthread_setcancelstate (__oldcancel, &__oldcancel);
#endif

15
newlib/libc/stdio64/freopen64.c
View File

@ -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