forked from KolibriOS/kolibrios
newlib: update
git-svn-id: svn://kolibrios.org@6099 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
@@ -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
|
||||
@@ -209,7 +212,7 @@ _DEFUN(_freopen_r, (ptr, file, mode, fp),
|
||||
FREELB (ptr, fp);
|
||||
fp->_lb._size = 0;
|
||||
fp->_flags &= ~__SORD;
|
||||
fp->_flags2 = 0;
|
||||
fp->_flags2 &= ~__SWID;
|
||||
memset (&fp->_mbstate, 0, sizeof (_mbstate_t));
|
||||
|
||||
if (f < 0)
|
||||
@@ -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
|
||||
|
Reference in New Issue
Block a user