libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-01-18 12:29:32 +08:00
Code Issues Projects Releases Wiki Activity

2000-08-08 Jeff Johnston <jjohnstn@redhat.com>

Browse Source 
* libc/stdio/snprintf.c (snprintf, _snprintf_r): Fixed code
        so size of 0 results in nothing being written to string.
        Also fixed code so that when size is non-zero, there is only
        a maximum of size - 1 characters written to the array and
        a nul terminator is appended at the end.
        * libc/stdio/vsnprintf.c (vsnprintf, _vsnprintf_r): Ditto.
This commit is contained in:
Jeff Johnston 2000-08-08 19:01:02 +00:00
parent 0e882d4f29
commit befe0fb3e1
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
newlib/ChangeLog
View File

@ -1,3 +1,12 @@
2000-08-08 Jeff Johnston <jjohnstn@redhat.com>
* libc/stdio/snprintf.c (snprintf, _snprintf_r): Fixed code
so size of 0 results in nothing being written to string.
Also fixed code so that when size is non-zero, there is only
a maximum of size - 1 characters written to the array and
a nul terminator is appended at the end.
* libc/stdio/vsnprintf.c (vsnprintf, _vsnprintf_r): Ditto.
2000-08-01 DJ Delorie <dj@redhat.com> 2000-08-01 DJ Delorie <dj@redhat.com>
* libc/include/sys/config.h: define __IMPORT appropriately * libc/include/sys/config.h: define __IMPORT appropriately

10
newlib/libc/stdio/snprintf.c
View File

@ -47,7 +47,7 @@ _snprintf_r (ptr, str, size, fmt, va_alist)
f._flags = __SWR | __SSTR; f._flags = __SWR | __SSTR;
f._bf._base = f._p = (unsigned char *) str; f._bf._base = f._p = (unsigned char *) str;
f._bf._size = f._w = size; f._bf._size = f._w = (size > 0 ? size - 1 : 0);
f._data = ptr; f._data = ptr;
#ifdef _HAVE_STDC #ifdef _HAVE_STDC
va_start (ap, fmt); va_start (ap, fmt);
@ -56,7 +56,8 @@ _snprintf_r (ptr, str, size, fmt, va_alist)
#endif #endif
ret = vfprintf (&f, fmt, ap); ret = vfprintf (&f, fmt, ap);
va_end (ap); va_end (ap);
*f._p = 0; if (size > 0)
*f._p = 0;
return (ret); return (ret);
} }
@ -79,7 +80,7 @@ snprintf (str, size, fmt, va_alist)
f._flags = __SWR | __SSTR; f._flags = __SWR | __SSTR;
f._bf._base = f._p = (unsigned char *) str; f._bf._base = f._p = (unsigned char *) str;
f._bf._size = f._w = size; f._bf._size = f._w = (size > 0 ? size - 1 : 0);
f._data = _REENT; f._data = _REENT;
#ifdef _HAVE_STDC #ifdef _HAVE_STDC
va_start (ap, fmt); va_start (ap, fmt);
@ -88,7 +89,8 @@ snprintf (str, size, fmt, va_alist)
#endif #endif
ret = vfprintf (&f, fmt, ap); ret = vfprintf (&f, fmt, ap);
va_end (ap); va_end (ap);
*f._p = 0; if (size > 0)
*f._p = 0;
return (ret); return (ret);
} }

10
newlib/libc/stdio/vsnprintf.c
View File

@ -45,10 +45,11 @@ vsnprintf (str, size, fmt, ap)
f._flags = __SWR | __SSTR; f._flags = __SWR | __SSTR;
f._bf._base = f._p = (unsigned char *) str; f._bf._base = f._p = (unsigned char *) str;
f._bf._size = f._w = size; f._bf._size = f._w = (size > 0 ? size - 1 : 0);
f._data = _REENT; f._data = _REENT;
ret = vfprintf (&f, fmt, ap); ret = vfprintf (&f, fmt, ap);
*f._p = 0; if (size > 0)
*f._p = 0;
return ret; return ret;
} }
@ -65,9 +66,10 @@ vsnprintf_r (ptr, str, size, fmt, ap)
f._flags = __SWR | __SSTR; f._flags = __SWR | __SSTR;
f._bf._base = f._p = (unsigned char *) str; f._bf._base = f._p = (unsigned char *) str;
f._bf._size = f._w = size; f._bf._size = f._w = (size > 0 ? size - 1 : 0);
f._data = ptr; f._data = ptr;
ret = vfprintf (&f, fmt, ap); ret = vfprintf (&f, fmt, ap);
*f._p = 0; if (size > 0)
*f._p = 0;
return ret; return ret;
} }