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

Fix 2008-04-14 regression in asprintf(ptr,"").

Browse Source 
* libc/stdio/asnprintf.c (asnprintf, _asnprintf_r): Avoid stdio
baggage.
* libc/stdio/asniprintf.c (asniprintf, _asniprintf_r): Likewise.
* libc/stdio/asiprintf.c (asiprintf, _asiprintf_r): Likewise.
* libc/stdio/vasniprintf.c (_vasniprintf_r): Likewise.
* libc/stdio/vsnprintf.c (_vsnprintf_r): Likewise.
* libc/stdio/vfprintf.c (_VFPRINTF_R) [STRING_ONLY]: Always malloc
an initial buffer for asprintf.
This commit is contained in:
Eric Blake 2008-04-30 02:47:14 +00:00
parent 661efd2dea
commit f77a1a8848
7 changed files with 67 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
newlib/ChangeLog
View File

@ -1,3 +1,15 @@
2008-04-29 Eric Blake <ebb9@byu.net>
Fix 2008-04-14 regression in asprintf(ptr,"").
* libc/stdio/asnprintf.c (asnprintf, _asnprintf_r): Avoid stdio
baggage.
* libc/stdio/asniprintf.c (asniprintf, _asniprintf_r): Likewise.
* libc/stdio/asiprintf.c (asiprintf, _asiprintf_r): Likewise.
* libc/stdio/vasniprintf.c (_vasniprintf_r): Likewise.
* libc/stdio/vsnprintf.c (_vsnprintf_r): Likewise.
* libc/stdio/vfprintf.c (_VFPRINTF_R) [STRING_ONLY]: Always malloc
an initial buffer for asprintf.
2008-04-24 Corinna Vinschen <corinna@vinschen.de> 2008-04-24 Corinna Vinschen <corinna@vinschen.de>
* libc/include/sys/stat.h: Guard at-functions with !__INSIDE_CYGWIN__. * libc/include/sys/stat.h: Guard at-functions with !__INSIDE_CYGWIN__.

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

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1990, 2007 The Regents of the University of California. * Copyright (c) 1990 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms are permitted * Redistribution and use in source and binary forms are permitted
@ -40,7 +40,7 @@ _DEFUN(_asiprintf_r, (ptr, strp, fmt),
f._bf._size = f._w = 0; f._bf._size = f._w = 0;
f._file = -1; /* No file. */ f._file = -1; /* No file. */
va_start (ap, fmt); va_start (ap, fmt);
ret = _vfiprintf_r (ptr, &f, fmt, ap); ret = _svfiprintf_r (ptr, &f, fmt, ap);
va_end (ap); va_end (ap);
if (ret >= 0) if (ret >= 0)
{ {
@ -67,7 +67,7 @@ _DEFUN(asiprintf, (strp, fmt),
f._bf._size = f._w = 0; f._bf._size = f._w = 0;
f._file = -1; /* No file. */ f._file = -1; /* No file. */
va_start (ap, fmt); va_start (ap, fmt);
ret = _vfiprintf_r (_REENT, &f, fmt, ap); ret = _svfiprintf_r (_REENT, &f, fmt, ap);
va_end (ap); va_end (ap);
if (ret >= 0) if (ret >= 0)
{ {

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

@ -1,4 +1,4 @@
/* Copyright (C) 2007 Eric Blake /* Copyright (C) 2007, 2008 Eric Blake
* Permission to use, copy, modify, and distribute this software * Permission to use, copy, modify, and distribute this software
* is freely granted, provided that this notice is preserved. * is freely granted, provided that this notice is preserved.
*/ */
@ -48,7 +48,7 @@ _DEFUN(_asniprintf_r, (ptr, buf, lenp, fmt),
f._bf._size = f._w = len; f._bf._size = f._w = len;
f._file = -1; /* No file. */ f._file = -1; /* No file. */
va_start (ap, fmt); va_start (ap, fmt);
ret = _vfiprintf_r (ptr, &f, fmt, ap); ret = _svfiprintf_r (ptr, &f, fmt, ap);
va_end (ap); va_end (ap);
if (ret < 0) if (ret < 0)
return NULL; return NULL;
@ -95,7 +95,7 @@ _DEFUN(asniprintf, (buf, lenp, fmt),
f._bf._size = f._w = len; f._bf._size = f._w = len;
f._file = -1; /* No file. */ f._file = -1; /* No file. */
va_start (ap, fmt); va_start (ap, fmt);
ret = _vfiprintf_r (ptr, &f, fmt, ap); ret = _svfiprintf_r (ptr, &f, fmt, ap);
va_end (ap); va_end (ap);
if (ret < 0) if (ret < 0)
return NULL; return NULL;

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

@ -1,4 +1,4 @@
/* Copyright (C) 2007 Eric Blake /* Copyright (C) 2007, 2008 Eric Blake
* Permission to use, copy, modify, and distribute this software * Permission to use, copy, modify, and distribute this software
* is freely granted, provided that this notice is preserved. * is freely granted, provided that this notice is preserved.
*/ */
@ -48,7 +48,7 @@ _DEFUN(_asnprintf_r, (ptr, buf, lenp, fmt),
f._bf._size = f._w = len; f._bf._size = f._w = len;
f._file = -1; /* No file. */ f._file = -1; /* No file. */
va_start (ap, fmt); va_start (ap, fmt);
ret = _vfprintf_r (ptr, &f, fmt, ap); ret = _svfprintf_r (ptr, &f, fmt, ap);
va_end (ap); va_end (ap);
if (ret < 0) if (ret < 0)
return NULL; return NULL;
@ -95,7 +95,7 @@ _DEFUN(asnprintf, (buf, lenp, fmt),
f._bf._size = f._w = len; f._bf._size = f._w = len;
f._file = -1; /* No file. */ f._file = -1; /* No file. */
va_start (ap, fmt); va_start (ap, fmt);
ret = _vfprintf_r (ptr, &f, fmt, ap); ret = _svfprintf_r (ptr, &f, fmt, ap);
va_end (ap); va_end (ap);
if (ret < 0) if (ret < 0)
return NULL; return NULL;

4
newlib/libc/stdio/vasniprintf.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2007 Eric Blake /* Copyright (C) 2007, 2008 Eric Blake
* Permission to use, copy, modify, and distribute this software * Permission to use, copy, modify, and distribute this software
* is freely granted, provided that this notice is preserved. * is freely granted, provided that this notice is preserved.
*/ */
@ -47,7 +47,7 @@ _DEFUN(_vasniprintf_r, (ptr, buf, lenp, fmt, ap),
} }
f._bf._size = f._w = len; f._bf._size = f._w = len;
f._file = -1; /* No file. */ f._file = -1; /* No file. */
ret = _vfiprintf_r (ptr, &f, fmt, ap); ret = _svfiprintf_r (ptr, &f, fmt, ap);
if (ret < 0) if (ret < 0)
return NULL; return NULL;
*lenp = ret; *lenp = ret;

12
newlib/libc/stdio/vfprintf.c
View File

@ -639,6 +639,18 @@ _DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap),
_funlockfile (fp); _funlockfile (fp);
return (__sbprintf (data, fp, fmt0, ap)); return (__sbprintf (data, fp, fmt0, ap));
} }
#else /* STRING_ONLY */
/* Create initial buffer if we are called by asprintf family. */
if (fp->_flags & __SMBF && !fp->_bf._base)
{
fp->_bf._base = fp->_p = _malloc_r (data, 64);
if (!fp->_p)
{
data->_errno = ENOMEM;
return EOF;
}
fp->_bf._size = 64;
}
#endif /* STRING_ONLY */ #endif /* STRING_ONLY */
fmt = (char *)fmt0; fmt = (char *)fmt0;

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

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1990, 2007 The Regents of the University of California. * Copyright (c) 1990 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms are permitted * Redistribution and use in source and binary forms are permitted
@ -61,7 +61,7 @@ _DEFUN(_vsnprintf_r, (ptr, str, size, fmt, ap),
f._bf._base = f._p = (unsigned char *) str; f._bf._base = f._p = (unsigned char *) str;
f._bf._size = f._w = (size > 0 ? size - 1 : 0); f._bf._size = f._w = (size > 0 ? size - 1 : 0);
f._file = -1; /* No file. */ f._file = -1; /* No file. */
ret = _vfprintf_r (ptr, &f, fmt, ap); ret = _svfprintf_r (ptr, &f, fmt, ap);
if (ret < EOF) if (ret < EOF)
ptr->_errno = EOVERFLOW; ptr->_errno = EOVERFLOW;
if (size > 0) if (size > 0)