From 414e7948118bb3b7071e7c8cbddcf371e0d48e38 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 8 Dec 2015 18:44:23 +0100 Subject: Fix re-initialization of FILE flags and mbstate in freopen * libc/stdio/freopen.c (_freopen_r): Only reset __SWID bit per SUSv4. * libc/stdio64/freopen64.c (_freopen64_r): Add missing resetting of flag values and _mbstate. Signed-off-by: Corinna Vinschen --- newlib/libc/stdio/freopen.c | 2 +- newlib/libc/stdio64/freopen64.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'newlib/libc') diff --git a/newlib/libc/stdio/freopen.c b/newlib/libc/stdio/freopen.c index a696a9dd8..235ffba53 100644 --- a/newlib/libc/stdio/freopen.c +++ b/newlib/libc/stdio/freopen.c @@ -209,7 +209,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) diff --git a/newlib/libc/stdio64/freopen64.c b/newlib/libc/stdio64/freopen64.c index dfe36ea3d..a183fb8ea 100644 --- a/newlib/libc/stdio64/freopen64.c +++ b/newlib/libc/stdio64/freopen64.c @@ -208,6 +208,9 @@ _DEFUN (_freopen64_r, (ptr, file, mode, fp), if (HASLB (fp)) FREELB (ptr, fp); fp->_lb._size = 0; + fp->_flags &= ~__SORD; + fp->_flags2 &= ~__SWID; + memset (&fp->_mbstate, 0, sizeof (_mbstate_t)); if (f < 0) { /* did not get it after all */ -- cgit v1.2.3