From a318b88b534ae81ee0fa61a4e8308f2701de78fc Mon Sep 17 00:00:00 2001 From: jjohnstn Date: Wed, 5 Feb 2003 16:52:34 +0000 Subject: [PATCH] 2003-02-05 Jonathan Larmour * libc/stdio/vsprintf.c (vsprintf, _vsprintf_r): Set _file fd to -1 to be sure it cannot later match a valid file fd causing isatty() to return 1. * libc/stdio/asprintf.c (asprintf, _asprintf_r): Ditto. * libc/stdio/sprintf.c (sprintf, _sprintf_r): Ditto. * libc/stdio/vasprintf.c (vasprintf, _vasprintf_r): Ditto. --- newlib/ChangeLog | 9 +++++++++ newlib/libc/stdio/asprintf.c | 2 ++ newlib/libc/stdio/sprintf.c | 2 ++ newlib/libc/stdio/vasprintf.c | 2 ++ newlib/libc/stdio/vsprintf.c | 2 ++ 5 files changed, 17 insertions(+) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 7ec7bcaa0b..30338d9e07 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,12 @@ +2003-02-05 Jonathan Larmour + + * libc/stdio/vsprintf.c (vsprintf, _vsprintf_r): Set _file fd to + -1 to be sure it cannot later match a valid file fd causing + isatty() to return 1. + * libc/stdio/asprintf.c (asprintf, _asprintf_r): Ditto. + * libc/stdio/sprintf.c (sprintf, _sprintf_r): Ditto. + * libc/stdio/vasprintf.c (vasprintf, _vasprintf_r): Ditto. + 2003-02-03 Jeff Johnston * libc/stdlib/ldtoa.c (_ldtoa_r): Fix code to allocate the format diff --git a/newlib/libc/stdio/asprintf.c b/newlib/libc/stdio/asprintf.c index d367815482..85bdd313b1 100644 --- a/newlib/libc/stdio/asprintf.c +++ b/newlib/libc/stdio/asprintf.c @@ -47,6 +47,7 @@ _asprintf_r (ptr, strp, fmt, va_alist) f._bf._base = f._p = NULL; f._bf._size = f._w = 0; f._data = ptr; + f._file = -1; /* No file. */ #ifdef _HAVE_STDC va_start (ap, fmt); #else @@ -80,6 +81,7 @@ asprintf (strp, fmt, va_alist) f._bf._base = f._p = NULL; f._bf._size = f._w = 0; f._data = _REENT; + f._file = -1; /* No file. */ #ifdef _HAVE_STDC va_start (ap, fmt); #else diff --git a/newlib/libc/stdio/sprintf.c b/newlib/libc/stdio/sprintf.c index 879b480c9f..8582272d7a 100644 --- a/newlib/libc/stdio/sprintf.c +++ b/newlib/libc/stdio/sprintf.c @@ -325,6 +325,7 @@ _sprintf_r (ptr, str, fmt, va_alist) f._bf._base = f._p = (unsigned char *) str; f._bf._size = f._w = INT_MAX; f._data = ptr; + f._file = -1; /* No file. */ #ifdef _HAVE_STDC va_start (ap, fmt); #else @@ -356,6 +357,7 @@ sprintf (str, fmt, va_alist) f._bf._base = f._p = (unsigned char *) str; f._bf._size = f._w = INT_MAX; f._data = _REENT; + f._file = -1; /* No file. */ #ifdef _HAVE_STDC va_start (ap, fmt); #else diff --git a/newlib/libc/stdio/vasprintf.c b/newlib/libc/stdio/vasprintf.c index 7f35752c78..fbfedee00c 100644 --- a/newlib/libc/stdio/vasprintf.c +++ b/newlib/libc/stdio/vasprintf.c @@ -46,6 +46,7 @@ _DEFUN (vasprintf, (strp, fmt, ap), f._bf._base = f._p = NULL; f._bf._size = f._w = 0; f._data = _REENT; + f._file = -1; /* No file. */ ret = vfprintf (&f, fmt, ap); *f._p = 0; *strp = f._bf._base; @@ -66,6 +67,7 @@ _DEFUN (_vasprintf_r, (ptr, strp, fmt, ap), f._bf._base = f._p = NULL; f._bf._size = f._w = 0; f._data = ptr; + f._file = -1; /* No file. */ ret = _vfprintf_r (ptr, &f, fmt, ap); *f._p = 0; *strp = f._bf._base; diff --git a/newlib/libc/stdio/vsprintf.c b/newlib/libc/stdio/vsprintf.c index b440ac5061..3b92f2676a 100644 --- a/newlib/libc/stdio/vsprintf.c +++ b/newlib/libc/stdio/vsprintf.c @@ -44,6 +44,7 @@ _DEFUN (vsprintf, (str, fmt, ap), f._bf._base = f._p = (unsigned char *) str; f._bf._size = f._w = INT_MAX; f._data = _REENT; + f._file = -1; /* No file. */ ret = vfprintf (&f, fmt, ap); *f._p = 0; return ret; @@ -63,6 +64,7 @@ _DEFUN (_vsprintf_r, (ptr, str, fmt, ap), f._bf._base = f._p = (unsigned char *) str; f._bf._size = f._w = INT_MAX; f._data = ptr; + f._file = -1; /* No file. */ ret = _vfprintf_r (ptr, &f, fmt, ap); *f._p = 0; return ret; -- 2.11.0