Add support for asnprintf, and improve *printf documentation.

* libc/stdio/Makefile.am (ELIX_SOURCES): Rename...
	(ELIX_2_SOURCES): ...to this.
	(ELIX_4_SOURCES): Add new variable.  Build asnprintf.
	(GENERAL_SOURCES): Move dprintf to ELIX_4_SOURCES.
	(CHEWOUT_FILES): Include diprintf in documentation.
	* libc/stdio/Makefile.in: Regenerate.
	* libc/stdio/diprintf.c: Improve documentation.
	* libc/stdio/dprintf.c: Likewise.
	* libc/stdio/siprintf.c: Likewise.
	* libc/stdio/sprintf.c: Likewise.
	* libc/stdio/vfprintf.c: Likewise.
	* libc/stdio/viprintf.c: Likewise.
	* libc/stdio/vsniprintf.c: Consolidate documentation.
	* libc/stdio/asiprintf.c: Refer to documentation.
	* libc/stdio/asprintf.c: Likewise.
	* libc/stdio/fiprintf.c: Likewise.
	* libc/stdio/fprintf.c: Likewise.
	* libc/stdio/iprintf.c: Likewise.
	* libc/stdio/printf.c: Likewise.
	* libc/stdio/sniprintf.c: Likewise.
	* libc/stdio/vdiprintf.c: Likewise.
	* libc/stdio/vdprintf.c: Likewise.
	* libc/stdio/vsiprintf.c: Likewise.
	* libc/stdio/fvwrite.c (__sfvwrite_r): Handle asnprintf.
	* libc/stdio/asniprintf.c (asniprintf, _asniprintf_r): New file.
	* libc/stdio/asnprintf.c (asnprintf, _asnprintf_r): New file.
	* libc/stdio/vasniprintf.c (vasniprintf, _vasniprintf_r): New
	file.
	* libc/stdio/vasnprintf.c (vasnprintf, _vasnprintf_r): New file.
	* libc/stdio/vdprintf.c (_vdprintf_r): Rewrite to avoid malloc in
	typical case.
	* libc/stdio/vdiprintf.c (_vdiprintf_r): Likewise.
	* libc/include/stdio.h: Add prototypes for new functions; sort
	existing functions.

newlib/ChangeLog

@@ -1,3 +1,41 @@
+2007-05-03  Eric Blake  <ebb9@byu.net>
+
+	Add support for asnprintf, and improve *printf documentation.
+	* libc/stdio/Makefile.am (ELIX_SOURCES): Rename...
+	(ELIX_2_SOURCES): ...to this.
+	(ELIX_4_SOURCES): Add new variable.  Build asnprintf.
+	(GENERAL_SOURCES): Move dprintf to ELIX_4_SOURCES.
+	(CHEWOUT_FILES): Include diprintf in documentation.
+	* libc/stdio/Makefile.in: Regenerate.
+	* libc/stdio/diprintf.c: Improve documentation.
+	* libc/stdio/dprintf.c: Likewise.
+	* libc/stdio/siprintf.c: Likewise.
+	* libc/stdio/sprintf.c: Likewise.
+	* libc/stdio/vfprintf.c: Likewise.
+	* libc/stdio/viprintf.c: Likewise.
+	* libc/stdio/vsniprintf.c: Consolidate documentation.
+	* libc/stdio/asiprintf.c: Refer to documentation.
+	* libc/stdio/asprintf.c: Likewise.
+	* libc/stdio/fiprintf.c: Likewise.
+	* libc/stdio/fprintf.c: Likewise.
+	* libc/stdio/iprintf.c: Likewise.
+	* libc/stdio/printf.c: Likewise.
+	* libc/stdio/sniprintf.c: Likewise.
+	* libc/stdio/vdiprintf.c: Likewise.
+	* libc/stdio/vdprintf.c: Likewise.
+	* libc/stdio/vsiprintf.c: Likewise.
+	* libc/stdio/fvwrite.c (__sfvwrite_r): Handle asnprintf.
+	* libc/stdio/asniprintf.c (asniprintf, _asniprintf_r): New file.
+	* libc/stdio/asnprintf.c (asnprintf, _asnprintf_r): New file.
+	* libc/stdio/vasniprintf.c (vasniprintf, _vasniprintf_r): New
+	file.
+	* libc/stdio/vasnprintf.c (vasnprintf, _vasnprintf_r): New file.
+	* libc/stdio/vdprintf.c (_vdprintf_r): Rewrite to avoid malloc in
+	typical case.
+	* libc/stdio/vdiprintf.c (_vdiprintf_r): Likewise.
+	* libc/include/stdio.h: Add prototypes for new functions; sort
+	existing functions.
+
 2007-05-03  Kazu Hirata  <kazu@codesourcery.com>
 
 	* libc/machine/m68k/Makefile.am (lib_a_SOURCES): Add memcpy.S

newlib/libc/include/stdio.h

@@ -238,6 +238,10 @@ off_t	_EXFUN(ftello, ( FILE *));
 #ifndef _REENT_ONLY
 int	_EXFUN(asiprintf, (char **, const char *, ...)
                _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
+char *	_EXFUN(asniprintf, (char *, size_t *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
+char *	_EXFUN(asnprintf, (char *, size_t *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
 int	_EXFUN(asprintf, (char **, const char *, ...)
                _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
 #ifndef dprintf
@@ -266,16 +270,16 @@ int	_EXFUN(sniprintf, (char *, size_t, const char *, ...)
 char *	_EXFUN(tempnam, (const char *, const char *));
 int	_EXFUN(vasiprintf, (char **, const char *, __VALIST)
                _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
+char *	_EXFUN(vasniprintf, (char *, size_t *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
+char *	_EXFUN(vasnprintf, (char *, size_t *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
 int	_EXFUN(vasprintf, (char **, const char *, __VALIST)
                _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
 int	_EXFUN(vdiprintf, (int, const char *, __VALIST)
                _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
 int	_EXFUN(vdprintf, (int, const char *, __VALIST)
                _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
-int	_EXFUN(vsniprintf, (char *, size_t, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	_EXFUN(vsnprintf, (char *, size_t, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
 int	_EXFUN(vfiprintf, (FILE *, const char *, __VALIST)
                _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
 int	_EXFUN(vfiscanf, (FILE *, const char *, __VALIST)
@@ -284,18 +288,22 @@ int	_EXFUN(vfscanf, (FILE *, const char *, __VALIST)
                _ATTRIBUTE ((__format__ (__scanf__, 2, 0))));
 int	_EXFUN(viprintf, (const char *, __VALIST)
                _ATTRIBUTE ((__format__ (__printf__, 1, 0))));
-int	_EXFUN(vsiprintf, (char *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
 int	_EXFUN(viscanf, (const char *, __VALIST)
                _ATTRIBUTE ((__format__ (__scanf__, 1, 0))));
 int	_EXFUN(vscanf, (const char *, __VALIST)
                _ATTRIBUTE ((__format__ (__scanf__, 1, 0))));
+int	_EXFUN(vsiprintf, (char *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
 int	_EXFUN(vsiscanf, (const char *, const char *, __VALIST)
                _ATTRIBUTE ((__format__ (__scanf__, 2, 0))));
+int	_EXFUN(vsniprintf, (char *, size_t, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
+int	_EXFUN(vsnprintf, (char *, size_t, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
 int	_EXFUN(vsscanf, (const char *, const char *, __VALIST)
                _ATTRIBUTE ((__format__ (__scanf__, 2, 0))));
-#endif
+#endif /* !_REENT_ONLY */
-#endif
+#endif /* !__STRICT_ANSI__ */
 
 /*
  * Routines in POSIX 1003.1.
@@ -319,7 +327,7 @@ int	_EXFUN(ftrylockfile, (FILE *));
 void	_EXFUN(funlockfile, (FILE *));
 int	_EXFUN(putc_unlocked, (int, FILE *));
 int	_EXFUN(putchar_unlocked, (int));
-#endif
+#endif /* ! __STRICT_ANSI__ */
 
 /*
  * Recursive versions of the above.
@@ -327,6 +335,10 @@ int	_EXFUN(putchar_unlocked, (int));
 
 int	_EXFUN(_asiprintf_r, (struct _reent *, char **, const char *, ...)
                _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
+char *	_EXFUN(_asniprintf_r, (struct _reent *, char *, size_t *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 4, 5))));
+char *	_EXFUN(_asnprintf_r, (struct _reent *, char *, size_t *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 4, 5))));
 int	_EXFUN(_asprintf_r, (struct _reent *, char **, const char *, ...)
                _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
 int	_EXFUN(_diprintf_r, (struct _reent *, int, const char *, ...)
@@ -394,6 +406,10 @@ char *	_EXFUN(_tmpnam_r, (struct _reent *, char *));
 int	_EXFUN(_ungetc_r, (struct _reent *, int, FILE *));
 int	_EXFUN(_vasiprintf_r, (struct _reent *, char **, const char *, __VALIST)
                _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
+char *	_EXFUN(_vasniprintf_r, (struct _reent*, char *, size_t *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 4, 0))));
+char *	_EXFUN(_vasnprintf_r, (struct _reent*, char *, size_t *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 4, 0))));
 int	_EXFUN(_vasprintf_r, (struct _reent *, char **, const char *, __VALIST)
                _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
 int	_EXFUN(_vdiprintf_r, (struct _reent *, int, const char *, __VALIST)
@@ -402,32 +418,32 @@ int	_EXFUN(_vdprintf_r, (struct _reent *, int, const char *, __VALIST)
                _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
 int	_EXFUN(_vfiprintf_r, (struct _reent *, FILE *, const char *, __VALIST)
                _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
+int	_EXFUN(_vfiscanf_r, (struct _reent *, FILE *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 3, 0))));
 int	_EXFUN(_vfprintf_r, (struct _reent *, FILE *, const char *, __VALIST)
                _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
+int	_EXFUN(_vfscanf_r, (struct _reent *, FILE *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 3, 0))));
 int	_EXFUN(_viprintf_r, (struct _reent *, const char *, __VALIST)
                _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
+int	_EXFUN(_viscanf_r, (struct _reent *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 2, 0))));
 int	_EXFUN(_vprintf_r, (struct _reent *, const char *, __VALIST)
                _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
+int	_EXFUN(_vscanf_r, (struct _reent *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 2, 0))));
 int	_EXFUN(_vsiprintf_r, (struct _reent *, char *, const char *, __VALIST)
                _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	_EXFUN(_vsprintf_r, (struct _reent *, char *, const char *, __VALIST)
+int	_EXFUN(_vsiscanf_r, (struct _reent *, const char *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
+               _ATTRIBUTE ((__format__ (__scanf__, 3, 0))));
 int	_EXFUN(_vsniprintf_r, (struct _reent *, char *, size_t, const char *, __VALIST)
                _ATTRIBUTE ((__format__ (__printf__, 4, 0))));
 int	_EXFUN(_vsnprintf_r, (struct _reent *, char *, size_t, const char *, __VALIST)
                _ATTRIBUTE ((__format__ (__printf__, 4, 0))));
-int	_EXFUN(_vfiscanf_r, (struct _reent *, FILE *, const char *, __VALIST)
+int	_EXFUN(_vsprintf_r, (struct _reent *, char *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 3, 0))));
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	_EXFUN(_vfscanf_r, (struct _reent *, FILE *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 3, 0))));
-int	_EXFUN(_viscanf_r, (struct _reent *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 0))));
-int	_EXFUN(_vscanf_r, (struct _reent *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 0))));
 int	_EXFUN(_vsscanf_r, (struct _reent *, const char *, const char *, __VALIST)
                _ATTRIBUTE ((__format__ (__scanf__, 3, 0))));
-int	_EXFUN(_vsiscanf_r, (struct _reent *, const char *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 3, 0))));
 
 ssize_t _EXFUN(__getdelim, (char **, size_t *, int, FILE *));
 ssize_t _EXFUN(__getline, (char **, size_t *, FILE *));

newlib/libc/stdio/Makefile.am

@@ -6,8 +6,6 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 GENERAL_SOURCES = \
 	clearerr.c			\
-	diprintf.c			\
-	dprintf.c			\
 	fclose.c			\
 	fdopen.c			\
 	feof.c				\
@@ -89,9 +87,9 @@ GENERAL_SOURCES = \
 
 ## The following are EL/IX level 2 interfaces
 if ELIX_LEVEL_1
-ELIX_SOURCES =
+ELIX_2_SOURCES =
 else
-ELIX_SOURCES = \
+ELIX_2_SOURCES = \
 	asiprintf.c		\
 	asprintf.c		\
 	fcloseall.c		\
@@ -104,6 +102,27 @@ ELIX_SOURCES = \
 	vasprintf.c
 endif
 
+## The following are EL/IX level 2 interfaces
+if ELIX_LEVEL_1
+ELIX_4_SOURCES =
+else
+if ELIX_LEVEL_2
+ELIX_4_SOURCES =
+else
+if ELIX_LEVEL_3
+ELIX_4_SOURCES =
+else
+ELIX_4_SOURCES = \
+	asniprintf.c		\
+	asnprintf.c		\
+	diprintf.c		\
+	dprintf.c		\
+	vasniprintf.c		\
+	vasnprintf.c
+endif !ELIX_LEVEL_3
+endif !ELIX_LEVEL_2
+endif !ELIX_LEVEL_1
+
 LIBADD_OBJS = \
 	$(lpfx)vfiprintf.$(oext) $(lpfx)vfprintf.$(oext) \
 	$(lpfx)vfscanf.$(oext) $(lpfx)vfiscanf.$(oext)
@@ -112,14 +131,14 @@ libstdio_la_LDFLAGS = -Xcompiler -nostdlib
 
 if USE_LIBTOOL
 noinst_LTLIBRARIES = libstdio.la
-libstdio_la_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
+libstdio_la_SOURCES = $(GENERAL_SOURCES) $(ELIX_2_SOURCES) $(ELIX_4_SOURCES)
 libstdio_la_LIBADD = $(LIBADD_OBJS)
 libstdio_la_DEPENDENCIES = $(LIBADD_OBJS)
 LIB_COMPILE = $(LTCOMPILE)
 noinst_DATA = objectlist.awk.in
 else
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
+lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_2_SOURCES) $(ELIX_4_SOURCES)
 lib_a_LIBADD = $(LIBADD_OBJS)
 lib_a_CFLAGS = $(AM_CFLAGS)
 lib_a_DEPENDENCIES = $(LIBADD_OBJS)
@@ -146,6 +165,7 @@ $(lpfx)vfiscanf.$(oext): vfscanf.c
 
 CHEWOUT_FILES = \
 	clearerr.def		\
+	diprintf.def		\
 	dprintf.def		\
 	fclose.def		\
 	fcloseall.def		\

newlib/libc/stdio/Makefile.in

@@ -54,8 +54,7 @@ ARFLAGS = cru
 lib_a_AR = $(AR) $(ARFLAGS)
 am__DEPENDENCIES_1 = $(lpfx)vfiprintf.$(oext) $(lpfx)vfprintf.$(oext) \
 	$(lpfx)vfscanf.$(oext) $(lpfx)vfiscanf.$(oext)
-am__objects_1 = lib_a-clearerr.$(OBJEXT) lib_a-diprintf.$(OBJEXT) \
+am__objects_1 = lib_a-clearerr.$(OBJEXT) lib_a-fclose.$(OBJEXT) \
-	lib_a-dprintf.$(OBJEXT) lib_a-fclose.$(OBJEXT) \
 	lib_a-fdopen.$(OBJEXT) lib_a-feof.$(OBJEXT) \
 	lib_a-ferror.$(OBJEXT) lib_a-fflush.$(OBJEXT) \
 	lib_a-fgetc.$(OBJEXT) lib_a-fgetpos.$(OBJEXT) \
@@ -105,31 +104,43 @@ am__objects_1 = lib_a-clearerr.$(OBJEXT) lib_a-diprintf.$(OBJEXT) \
 @ELIX_LEVEL_1_FALSE@	lib_a-putw.$(OBJEXT) \
 @ELIX_LEVEL_1_FALSE@	lib_a-vasiprintf.$(OBJEXT) \
 @ELIX_LEVEL_1_FALSE@	lib_a-vasprintf.$(OBJEXT)
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@am__objects_3 = lib_a-asniprintf.$(OBJEXT) \
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	lib_a-asnprintf.$(OBJEXT) \
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	lib_a-diprintf.$(OBJEXT) \
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	lib_a-dprintf.$(OBJEXT) \
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	lib_a-vasniprintf.$(OBJEXT) \
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	lib_a-vasnprintf.$(OBJEXT)
 @USE_LIBTOOL_FALSE@am_lib_a_OBJECTS = $(am__objects_1) \
-@USE_LIBTOOL_FALSE@	$(am__objects_2)
+@USE_LIBTOOL_FALSE@	$(am__objects_2) $(am__objects_3)
 lib_a_OBJECTS = $(am_lib_a_OBJECTS)
 LTLIBRARIES = $(noinst_LTLIBRARIES)
-am__objects_3 = clearerr.lo diprintf.lo dprintf.lo fclose.lo fdopen.lo \
+am__objects_4 = clearerr.lo fclose.lo fdopen.lo feof.lo ferror.lo \
-	feof.lo ferror.lo fflush.lo fgetc.lo fgetpos.lo fgets.lo \
+	fflush.lo fgetc.lo fgetpos.lo fgets.lo fileno.lo findfp.lo \
-	fileno.lo findfp.lo fiprintf.lo flags.lo fopen.lo fprintf.lo \
+	fiprintf.lo flags.lo fopen.lo fprintf.lo fputc.lo fputs.lo \
-	fputc.lo fputs.lo fread.lo freopen.lo fscanf.lo fiscanf.lo \
+	fread.lo freopen.lo fscanf.lo fiscanf.lo fseek.lo fsetpos.lo \
-	fseek.lo fsetpos.lo ftell.lo fvwrite.lo fwalk.lo fwrite.lo \
+	ftell.lo fvwrite.lo fwalk.lo fwrite.lo getc.lo getchar.lo \
-	getc.lo getchar.lo getc_u.lo getchar_u.lo getdelim.lo \
+	getc_u.lo getchar_u.lo getdelim.lo getline.lo gets.lo \
-	getline.lo gets.lo iprintf.lo iscanf.lo makebuf.lo perror.lo \
+	iprintf.lo iscanf.lo makebuf.lo perror.lo printf.lo putc.lo \
-	printf.lo putc.lo putchar.lo putc_u.lo putchar_u.lo puts.lo \
+	putchar.lo putc_u.lo putchar_u.lo puts.lo refill.lo remove.lo \
-	refill.lo remove.lo rename.lo rewind.lo rget.lo scanf.lo \
+	rename.lo rewind.lo rget.lo scanf.lo sccl.lo setbuf.lo \
-	sccl.lo setbuf.lo setbuffer.lo setlinebuf.lo setvbuf.lo \
+	setbuffer.lo setlinebuf.lo setvbuf.lo siprintf.lo siscanf.lo \
-	siprintf.lo siscanf.lo sniprintf.lo snprintf.lo sprintf.lo \
+	sniprintf.lo snprintf.lo sprintf.lo sscanf.lo stdio.lo \
-	sscanf.lo stdio.lo tmpfile.lo tmpnam.lo ungetc.lo vdiprintf.lo \
+	tmpfile.lo tmpnam.lo ungetc.lo vdiprintf.lo vdprintf.lo \
-	vdprintf.lo viprintf.lo viscanf.lo vprintf.lo vscanf.lo \
+	viprintf.lo viscanf.lo vprintf.lo vscanf.lo vsiprintf.lo \
-	vsiprintf.lo vsiscanf.lo vsnprintf.lo vsniprintf.lo \
+	vsiscanf.lo vsnprintf.lo vsniprintf.lo vsprintf.lo vsscanf.lo \
-	vsprintf.lo vsscanf.lo wbuf.lo wsetup.lo
+	wbuf.lo wsetup.lo
-@ELIX_LEVEL_1_FALSE@am__objects_4 = asiprintf.lo asprintf.lo \
+@ELIX_LEVEL_1_FALSE@am__objects_5 = asiprintf.lo asprintf.lo \
 @ELIX_LEVEL_1_FALSE@	fcloseall.lo fseeko.lo ftello.lo getw.lo \
 @ELIX_LEVEL_1_FALSE@	mktemp.lo putw.lo vasiprintf.lo \
 @ELIX_LEVEL_1_FALSE@	vasprintf.lo
-@USE_LIBTOOL_TRUE@am_libstdio_la_OBJECTS = $(am__objects_3) \
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@am__objects_6 = asniprintf.lo \
-@USE_LIBTOOL_TRUE@	$(am__objects_4)
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	asnprintf.lo \
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	diprintf.lo \
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	dprintf.lo \
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	vasniprintf.lo \
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	vasnprintf.lo
+@USE_LIBTOOL_TRUE@am_libstdio_la_OBJECTS = $(am__objects_4) \
+@USE_LIBTOOL_TRUE@	$(am__objects_5) $(am__objects_6)
 libstdio_la_OBJECTS = $(am_libstdio_la_OBJECTS)
 @USE_LIBTOOL_TRUE@am_libstdio_la_rpath =
 DEFAULT_INCLUDES = -I. -I$(srcdir)
@@ -295,8 +306,6 @@ AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 GENERAL_SOURCES = \
 	clearerr.c			\
-	diprintf.c			\
-	dprintf.c			\
 	fclose.c			\
 	fdopen.c			\
 	feof.c				\
@@ -376,7 +385,7 @@ GENERAL_SOURCES = \
 	wbuf.c				\
 	wsetup.c
 
-@ELIX_LEVEL_1_FALSE@ELIX_SOURCES = \
+@ELIX_LEVEL_1_FALSE@ELIX_2_SOURCES = \
 @ELIX_LEVEL_1_FALSE@	asiprintf.c		\
 @ELIX_LEVEL_1_FALSE@	asprintf.c		\
 @ELIX_LEVEL_1_FALSE@	fcloseall.c		\
@@ -388,14 +397,25 @@ GENERAL_SOURCES = \
 @ELIX_LEVEL_1_FALSE@	vasiprintf.c		\
 @ELIX_LEVEL_1_FALSE@	vasprintf.c
 
-@ELIX_LEVEL_1_TRUE@ELIX_SOURCES = 
+@ELIX_LEVEL_1_TRUE@ELIX_2_SOURCES = 
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ELIX_4_SOURCES = \
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	asniprintf.c		\
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	asnprintf.c		\
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	diprintf.c		\
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	dprintf.c		\
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	vasniprintf.c		\
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	vasnprintf.c
+
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_TRUE@ELIX_4_SOURCES = 
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@ELIX_4_SOURCES = 
+@ELIX_LEVEL_1_TRUE@ELIX_4_SOURCES = 
 LIBADD_OBJS = \
 	$(lpfx)vfiprintf.$(oext) $(lpfx)vfprintf.$(oext) \
 	$(lpfx)vfscanf.$(oext) $(lpfx)vfiscanf.$(oext)
 
 libstdio_la_LDFLAGS = -Xcompiler -nostdlib
 @USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libstdio.la
-@USE_LIBTOOL_TRUE@libstdio_la_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
+@USE_LIBTOOL_TRUE@libstdio_la_SOURCES = $(GENERAL_SOURCES) $(ELIX_2_SOURCES) $(ELIX_4_SOURCES)
 @USE_LIBTOOL_TRUE@libstdio_la_LIBADD = $(LIBADD_OBJS)
 @USE_LIBTOOL_TRUE@libstdio_la_DEPENDENCIES = $(LIBADD_OBJS)
 @USE_LIBTOOL_FALSE@LIB_COMPILE = $(COMPILE)
@@ -403,12 +423,13 @@ libstdio_la_LDFLAGS = -Xcompiler -nostdlib
 @USE_LIBTOOL_FALSE@noinst_DATA = 
 @USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
 @USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
+@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_2_SOURCES) $(ELIX_4_SOURCES)
 @USE_LIBTOOL_FALSE@lib_a_LIBADD = $(LIBADD_OBJS)
 @USE_LIBTOOL_FALSE@lib_a_CFLAGS = $(AM_CFLAGS)
 @USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = $(LIBADD_OBJS)
 CHEWOUT_FILES = \
 	clearerr.def		\
+	diprintf.def		\
 	dprintf.def		\
 	fclose.def		\
 	fcloseall.def		\
@@ -541,18 +562,6 @@ lib_a-clearerr.o: clearerr.c
 lib_a-clearerr.obj: clearerr.c
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-clearerr.obj `if test -f 'clearerr.c'; then $(CYGPATH_W) 'clearerr.c'; else $(CYGPATH_W) '$(srcdir)/clearerr.c'; fi`
 
-lib_a-diprintf.o: diprintf.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-diprintf.o `test -f 'diprintf.c' || echo '$(srcdir)/'`diprintf.c
-
-lib_a-diprintf.obj: diprintf.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-diprintf.obj `if test -f 'diprintf.c'; then $(CYGPATH_W) 'diprintf.c'; else $(CYGPATH_W) '$(srcdir)/diprintf.c'; fi`
-
-lib_a-dprintf.o: dprintf.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-dprintf.o `test -f 'dprintf.c' || echo '$(srcdir)/'`dprintf.c
-
-lib_a-dprintf.obj: dprintf.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-dprintf.obj `if test -f 'dprintf.c'; then $(CYGPATH_W) 'dprintf.c'; else $(CYGPATH_W) '$(srcdir)/dprintf.c'; fi`
-
 lib_a-fclose.o: fclose.c
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-fclose.o `test -f 'fclose.c' || echo '$(srcdir)/'`fclose.c
 
@@ -1081,6 +1090,42 @@ lib_a-vasprintf.o: vasprintf.c
 lib_a-vasprintf.obj: vasprintf.c
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vasprintf.obj `if test -f 'vasprintf.c'; then $(CYGPATH_W) 'vasprintf.c'; else $(CYGPATH_W) '$(srcdir)/vasprintf.c'; fi`
 
+lib_a-asniprintf.o: asniprintf.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-asniprintf.o `test -f 'asniprintf.c' || echo '$(srcdir)/'`asniprintf.c
+
+lib_a-asniprintf.obj: asniprintf.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-asniprintf.obj `if test -f 'asniprintf.c'; then $(CYGPATH_W) 'asniprintf.c'; else $(CYGPATH_W) '$(srcdir)/asniprintf.c'; fi`
+
+lib_a-asnprintf.o: asnprintf.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-asnprintf.o `test -f 'asnprintf.c' || echo '$(srcdir)/'`asnprintf.c
+
+lib_a-asnprintf.obj: asnprintf.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-asnprintf.obj `if test -f 'asnprintf.c'; then $(CYGPATH_W) 'asnprintf.c'; else $(CYGPATH_W) '$(srcdir)/asnprintf.c'; fi`
+
+lib_a-diprintf.o: diprintf.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-diprintf.o `test -f 'diprintf.c' || echo '$(srcdir)/'`diprintf.c
+
+lib_a-diprintf.obj: diprintf.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-diprintf.obj `if test -f 'diprintf.c'; then $(CYGPATH_W) 'diprintf.c'; else $(CYGPATH_W) '$(srcdir)/diprintf.c'; fi`
+
+lib_a-dprintf.o: dprintf.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-dprintf.o `test -f 'dprintf.c' || echo '$(srcdir)/'`dprintf.c
+
+lib_a-dprintf.obj: dprintf.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-dprintf.obj `if test -f 'dprintf.c'; then $(CYGPATH_W) 'dprintf.c'; else $(CYGPATH_W) '$(srcdir)/dprintf.c'; fi`
+
+lib_a-vasniprintf.o: vasniprintf.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vasniprintf.o `test -f 'vasniprintf.c' || echo '$(srcdir)/'`vasniprintf.c
+
+lib_a-vasniprintf.obj: vasniprintf.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vasniprintf.obj `if test -f 'vasniprintf.c'; then $(CYGPATH_W) 'vasniprintf.c'; else $(CYGPATH_W) '$(srcdir)/vasniprintf.c'; fi`
+
+lib_a-vasnprintf.o: vasnprintf.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vasnprintf.o `test -f 'vasnprintf.c' || echo '$(srcdir)/'`vasnprintf.c
+
+lib_a-vasnprintf.obj: vasnprintf.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vasnprintf.obj `if test -f 'vasnprintf.c'; then $(CYGPATH_W) 'vasnprintf.c'; else $(CYGPATH_W) '$(srcdir)/vasnprintf.c'; fi`
+
 mostlyclean-libtool:
 	-rm -f *.lo
 

newlib/libc/stdio/asiprintf.c

@@ -15,6 +15,7 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 /* This code was copied from asprintf.c */
+/* doc in siprintf.c */
 
 #include <_ansi.h>
 #include <reent.h>

newlib/libc/stdio/asniprintf.c

@@ -0,0 +1,105 @@
+/* Copyright (C) 2007 Eric Blake
+ * Permission to use, copy, modify, and distribute this software
+ * is freely granted, provided that this notice is preserved.
+ */
+/* This code was derived from asprintf.c */
+/* doc in siprintf.c */
+
+#include <_ansi.h>
+#include <reent.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <limits.h>
+#include <errno.h>
+
+char *
+_DEFUN(_asniprintf_r, (ptr, buf, lenp, fmt),
+       struct _reent *ptr _AND
+       char *buf _AND
+       size_t *lenp _AND
+       const char *fmt _DOTS)
+{
+  int ret;
+  va_list ap;
+  FILE f;
+  size_t len = *lenp;
+
+  if (buf && len)
+    {
+      /* mark an existing buffer, but allow allocation of larger string */
+      f._flags = __SWR | __SSTR | __SOPT;
+    }
+  else
+    {
+      /* mark a zero-length reallocatable buffer */
+      f._flags = __SWR | __SSTR | __SMBF;
+      len = 0;
+    }
+  f._bf._base = f._p = (unsigned char *) buf;
+  /* For now, inherit the 32-bit signed limit of FILE._bf._size.
+     FIXME - it would be nice to rewrite sys/reent.h to support size_t
+     for _size.  */
+  if (len > INT_MAX)
+    {
+      ptr->_errno = EOVERFLOW;
+      return NULL;
+    }
+  f._bf._size = f._w = len;
+  f._file = -1;  /* No file. */
+  va_start (ap, fmt);
+  ret = _vfiprintf_r (ptr, &f, fmt, ap);
+  va_end (ap);
+  if (ret < 0)
+    return NULL;
+  *lenp = ret;
+  *f._p = '\0';
+  return (char *) f._bf._base;
+}
+
+#ifndef _REENT_ONLY
+
+char *
+_DEFUN(asniprintf, (buf, lenp, fmt),
+       char *buf _AND
+       size_t *lenp _AND
+       const char *fmt _DOTS)
+{
+  int ret;
+  va_list ap;
+  FILE f;
+  size_t len = *lenp;
+  struct _reent *ptr = _REENT;
+
+  if (buf && len)
+    {
+      /* mark an existing buffer, but allow allocation of larger string */
+      f._flags = __SWR | __SSTR | __SOPT;
+    }
+  else
+    {
+      /* mark a zero-length reallocatable buffer */
+      f._flags = __SWR | __SSTR | __SMBF;
+      len = 0;
+    }
+  f._bf._base = f._p = (unsigned char *) buf;
+  /* For now, inherit the 32-bit signed limit of FILE._bf._size.
+     FIXME - it would be nice to rewrite sys/reent.h to support size_t
+     for _size.  */
+  if (len > INT_MAX)
+    {
+      ptr->_errno = EOVERFLOW;
+      return NULL;
+    }
+  f._bf._size = f._w = len;
+  f._file = -1;  /* No file. */
+  va_start (ap, fmt);
+  ret = _vfiprintf_r (ptr, &f, fmt, ap);
+  va_end (ap);
+  if (ret < 0)
+    return NULL;
+  *lenp = ret;
+  *f._p = '\0';
+  return (char *) f._bf._base;
+}
+
+#endif /* ! _REENT_ONLY */

newlib/libc/stdio/asnprintf.c

@@ -0,0 +1,105 @@
+/* Copyright (C) 2007 Eric Blake
+ * Permission to use, copy, modify, and distribute this software
+ * is freely granted, provided that this notice is preserved.
+ */
+/* This code was derived from asprintf.c */
+/* doc in sprintf.c */
+
+#include <_ansi.h>
+#include <reent.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <limits.h>
+#include <errno.h>
+
+char *
+_DEFUN(_asnprintf_r, (ptr, buf, lenp, fmt),
+       struct _reent *ptr _AND
+       char *buf _AND
+       size_t *lenp _AND
+       const char *fmt _DOTS)
+{
+  int ret;
+  va_list ap;
+  FILE f;
+  size_t len = *lenp;
+
+  if (buf && len)
+    {
+      /* mark an existing buffer, but allow allocation of larger string */
+      f._flags = __SWR | __SSTR | __SOPT;
+    }
+  else
+    {
+      /* mark a zero-length reallocatable buffer */
+      f._flags = __SWR | __SSTR | __SMBF;
+      len = 0;
+    }
+  f._bf._base = f._p = (unsigned char *) buf;
+  /* For now, inherit the 32-bit signed limit of FILE._bf._size.
+     FIXME - it would be nice to rewrite sys/reent.h to support size_t
+     for _size.  */
+  if (len > INT_MAX)
+    {
+      ptr->_errno = EOVERFLOW;
+      return NULL;
+    }
+  f._bf._size = f._w = len;
+  f._file = -1;  /* No file. */
+  va_start (ap, fmt);
+  ret = _vfprintf_r (ptr, &f, fmt, ap);
+  va_end (ap);
+  if (ret < 0)
+    return NULL;
+  *lenp = ret;
+  *f._p = '\0';
+  return (char *) f._bf._base;
+}
+
+#ifndef _REENT_ONLY
+
+char *
+_DEFUN(asnprintf, (buf, lenp, fmt),
+       char *buf _AND
+       size_t *lenp _AND
+       const char *fmt _DOTS)
+{
+  int ret;
+  va_list ap;
+  FILE f;
+  size_t len = *lenp;
+  struct _reent *ptr = _REENT;
+
+  if (buf && len)
+    {
+      /* mark an existing buffer, but allow allocation of larger string */
+      f._flags = __SWR | __SSTR | __SOPT;
+    }
+  else
+    {
+      /* mark a zero-length reallocatable buffer */
+      f._flags = __SWR | __SSTR | __SMBF;
+      len = 0;
+    }
+  f._bf._base = f._p = (unsigned char *) buf;
+  /* For now, inherit the 32-bit signed limit of FILE._bf._size.
+     FIXME - it would be nice to rewrite sys/reent.h to support size_t
+     for _size.  */
+  if (len > INT_MAX)
+    {
+      ptr->_errno = EOVERFLOW;
+      return NULL;
+    }
+  f._bf._size = f._w = len;
+  f._file = -1;  /* No file. */
+  va_start (ap, fmt);
+  ret = _vfprintf_r (ptr, &f, fmt, ap);
+  va_end (ap);
+  if (ret < 0)
+    return NULL;
+  *lenp = ret;
+  *f._p = '\0';
+  return (char *) f._bf._base;
+}
+
+#endif /* ! _REENT_ONLY */

newlib/libc/stdio/asprintf.c

@@ -15,6 +15,7 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 /* This code was copied from sprintf.c */
+/* doc in sprintf.c */
 
 #include <_ansi.h>
 #include <reent.h>

newlib/libc/stdio/diprintf.c

@@ -5,7 +5,7 @@
 
 /*
 FUNCTION
-<<diprintf>>, <<vdiprintf>>---print to a file descriptor
+<<diprintf>>, <<vdiprintf>>---print to a file descriptor (integer only)
 
 INDEX
 	diprintf
@@ -26,6 +26,9 @@ DESCRIPTION
 <<diprintf>> and <<vdiprintf>> are similar to <<dprintf>> and <<vdprintf>>,
 except that only integer format specifiers are processed.
 
+The functions <<_diprintf_r>> and <<_vdiprintf_r>> are simply
+reentrant versions of the functions above.
+
 RETURNS
 Similar to <<dprintf>> and <<vdprintf>>.
 

newlib/libc/stdio/dprintf.c

@@ -22,30 +22,6 @@ ANSI_SYNOPSIS
 	int _vdprintf_r(struct _reent *<[ptr]>, int <[fd]>,
 			const char *<[format]>, va_list <[ap]>);
 
-TRAD_SYNOPSIS
-        #include <stdio.h>
-        #include <varargs.h>
-
-        int dprintf(<[fd]>, <[format]> [, <[arg]>, ...])
-	int <[fd]>;
-        char *<[format]>;
-
-        int vdprintf(<[fd]>, <[fmt]>, <[list]>)
-	int <[fd]>;
-        char *<[fmt]>;
-        va_list <[list]>;
-
-        int _dprintf_r(<[ptr]>, <[fd]>, <[format]> [, <[arg]>, ...])
-	struct _reent *<[ptr]>;
-	int <[fd]>;
-        char *<[format]>;
-
-        int _vdprintf_r(<[ptr]>, <[fd]>, <[fmt]>, <[list]>)
-	struct _reent *<[ptr]>;
-	int <[fd]>;
-        char *<[fmt]>;
-        va_list <[list]>;
-
 DESCRIPTION
 <<dprintf>> and <<vdprintf>> allow printing a format, similarly to
 <<printf>>, but write to a file descriptor instead of to a <<FILE>>

newlib/libc/stdio/fiprintf.c

@@ -14,6 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
+/* doc in siprintf.c */
 
 #include <_ansi.h>
 #include <reent.h>

newlib/libc/stdio/fprintf.c

@@ -14,6 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
+/* doc in sprintf.c */
 
 #include <_ansi.h>
 #include <reent.h>

newlib/libc/stdio/fvwrite.c

@@ -127,7 +127,7 @@ _DEFUN(__sfvwrite_r, (ptr, fp, uio),
 	  w = fp->_w;
 	  if (fp->_flags & __SSTR)
 	    {
-	      if (len >= w && fp->_flags & __SMBF)
+	      if (len >= w && fp->_flags & (__SMBF | __SOPT))
 		{ /* must be asprintf family */
 		  unsigned char *str;
 		  int curpos = (fp->_p - fp->_bf._base);
@@ -141,6 +141,20 @@ _DEFUN(__sfvwrite_r, (ptr, fp, uio),
 		  int newsize = fp->_bf._size * 3 / 2;
 		  if (newsize < curpos + len + 1)
 		    newsize = curpos + len + 1;
+		  if (fp->_flags & __SOPT)
+		    {
+		      /* asnprintf leaves original buffer alone.  */
+		      str = (unsigned char *)_malloc_r (ptr, newsize);
+		      if (!str)
+			{
+			  ptr->_errno = ENOMEM;
+			  goto err;
+			}
+		      memcpy (str, fp->_bf._base, curpos);
+		      fp->_flags = (fp->_flags & ~__SOPT) | __SMBF;
+		    }
+		  else
+		    {
 		      str = (unsigned char *)_realloc_r (ptr, fp->_bf._base,
 							 newsize);
 		      if (!str)
@@ -151,6 +165,7 @@ _DEFUN(__sfvwrite_r, (ptr, fp, uio),
 			  ptr->_errno = ENOMEM;
 			  goto err;
 			}
+		    }
 		  fp->_bf._base = str;
 		  fp->_p = str + curpos;
 		  fp->_bf._size = newsize;

newlib/libc/stdio/iprintf.c

@@ -14,6 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
+/* doc in siprintf.c */
 
 #include <_ansi.h>
 #include <reent.h>

newlib/libc/stdio/printf.c

@@ -14,6 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
+/* doc in sprintf.c */
 
 #include <_ansi.h>
 #include <reent.h>

newlib/libc/stdio/siprintf.c

@@ -17,18 +17,20 @@
 
 /*
 FUNCTION
-        <<iprintf>>, <<fiprintf>>, <<asiprintf>>, <<siprintf>>, <<sniprintf>>---format output
+<<iprintf>>, <<fiprintf>>, <<siprintf>>, <<sniprintf>>, <<asiprintf>>, <<asniprintf>>---format output (integer only)
 
 INDEX
 	fiprintf
 INDEX
 	iprintf
-INDEX
-	asiprintf
 INDEX
 	siprintf
 INDEX
 	sniprintf
+INDEX
+	asiprintf
+INDEX
+	asniprintf
 
 ANSI_SYNOPSIS
         #include <stdio.h>
@@ -36,50 +38,44 @@ ANSI_SYNOPSIS
         int iprintf(const char *<[format]> [, <[arg]>, ...]);
         int fiprintf(FILE *<[fd]>, const char *<[format]> [, <[arg]>, ...]);
         int siprintf(char *<[str]>, const char *<[format]> [, <[arg]>, ...]);
-        int asiprintf(char **<[strp]>, const char *<[format]> [, <[arg]>, ...]);
         int sniprintf(char *<[str]>, size_t <[size]>, const char *<[format]>
                       [, <[arg]>, ...]);
+        int asiprintf(char **<[strp]>, const char *<[format]> [, <[arg]>, ...]);
+        char *asniprintf(char *<[str]>, size_t *<[size]>, const char *<[format]>
+                        [, <[arg]>, ...]);
 
-TRAD_SYNOPSIS
+        int _iprintf_r(struct _reent *<[ptr]>, const char *<[format]>
-	#include <stdio.h>
+                       [, <[arg]>, ...]);
-
+        int _fiprintf_r(struct _reent *<[ptr]>, FILE *<[fd]>,
-	int iprintf(<[format]> [, <[arg]>, ...])
+                        const char *<[format]> [, <[arg]>, ...]);
-	char *<[format]>;
+        int _siprintf_r(struct _reent *<[ptr]>, char *<[str]>,
-
+                        const char *<[format]> [, <[arg]>, ...]);
-	int fiprintf(<[fd]>, <[format]> [, <[arg]>, ...]);
+        int _sniprintf_r(struct _reent *<[ptr]>, char *<[str]>, size_t <[size]>,
-	FILE *<[fd]>;
+                         const char *<[format]> [, <[arg]>, ...]);
-	char *<[format]>;
+        int _asiprintf_r(struct _reent *<[ptr]>, char **<[strp]>,
-
+                         const char *<[format]> [, <[arg]>, ...]);
-	int asiprintf(<[strp]>, <[format]> [, <[arg]>, ...]);
+        char *_asniprintf_r(struct _reent *<[ptr]>, char *<[str]>,
-	char **<[strp]>;
+                            size_t *<[size]>, const char *<[format]>
-	char *<[format]>;
+                            [, <[arg]>, ...]);
-
-	int siprintf(<[str]>, <[format]> [, <[arg]>, ...]);
-	char *<[str]>;
-	char *<[format]>;
-
-	int sniprintf(<[str]>, size_t <[size]>, <[format]> [, <[arg]>, ...]);
-	char *<[str]>;
-        size_t <[size]>;
-	char *<[format]>;
 
 DESCRIPTION
         <<iprintf>>, <<fiprintf>>, <<siprintf>>, <<sniprintf>>,
-        <<asiprintf>>, are the same as <<printf>>, <<fprintf>>,
+        <<asiprintf>>, and <<asniprintf>> are the same as <<printf>>,
-	<<sprintf>>, <<snprintf>>, and <<asprintf>>, respectively,
+        <<fprintf>>, <<sprintf>>, <<snprintf>>, <<asprintf>>, and
-	only that they restrict usage to non-floating-point format
+        <<asnprintf>>, respectively, except that they restrict usage
-	specifiers.
+        to non-floating-point format specifiers.
+
+        <<_iprintf_r>>, <<_fiprintf_r>>, <<_asiprintf_r>>,
+        <<_siprintf_r>>, <<_sniprintf_r>>, <<_asniprintf_r>> are
+        simply reentrant versions of the functions above.
 
 RETURNS
-<<siprintf>> and <<asiprintf>> return the number of bytes in the output string,
+Similar to <<printf>>, <<fprintf>>, <<sprintf>>, <<snprintf>>, <<asprintf>>,
-save that the concluding <<NULL>> is not counted.
+and <<asnprintf>>.
-<<iprintf>> and <<fiprintf>> return the number of characters transmitted.
-If an error occurs, <<iprintf>> and <<fiprintf>> return <<EOF>> and
-<<asiprintf>> returns -1.  No error returns occur for <<siprintf>>.
 
 PORTABILITY
-<<iprintf>>, <<fiprintf>>, <<siprintf>>, <<sniprintf>>, and <<asprintf>>
+<<iprintf>>, <<fiprintf>>, <<siprintf>>, <<sniprintf>>, <<asiprintf>>,
-are newlib extensions.
+and <<asniprintf>> are newlib extensions.
 
 Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 <<lseek>>, <<read>>, <<sbrk>>, <<write>>.

newlib/libc/stdio/sniprintf.c

@@ -16,6 +16,7 @@
  */
 
 /* This code created by modifying snprintf.c so copyright inherited. */
+/* doc in siprintf.c */
 
 #include <_ansi.h>
 #include <reent.h>

newlib/libc/stdio/sprintf.c

@@ -17,7 +17,7 @@
 
 /*
 FUNCTION
-        <<printf>>, <<fprintf>>, <<asprintf>>, <<sprintf>>, <<snprintf>>---format output
+<<printf>>, <<fprintf>>, <<sprintf>>, <<snprintf>>, <<asprintf>>, <<asnprintf>>---format output
 
 INDEX
 	fprintf
@@ -29,6 +29,8 @@ INDEX
 	sprintf
 INDEX
 	snprintf
+INDEX
+	asnprintf
 
 ANSI_SYNOPSIS
         #include <stdio.h>
@@ -36,271 +38,508 @@ ANSI_SYNOPSIS
         int printf(const char *<[format]> [, <[arg]>, ...]);
         int fprintf(FILE *<[fd]>, const char *<[format]> [, <[arg]>, ...]);
         int sprintf(char *<[str]>, const char *<[format]> [, <[arg]>, ...]);
-        int asprintf(char **<[strp]>, const char *<[format]> [, <[arg]>, ...]);
         int snprintf(char *<[str]>, size_t <[size]>, const char *<[format]>
                      [, <[arg]>, ...]);
+        int asprintf(char **<[strp]>, const char *<[format]> [, <[arg]>, ...]);
+        char *asnprintf(char *<[str]>, size_t *<[size]>, const char *<[format]>
+                        [, <[arg]>, ...]);
 
-TRAD_SYNOPSIS
+        int _printf_r(struct _reent *<[ptr]>, const char *<[format]>
-	#include <stdio.h>
+                      [, <[arg]>, ...]);
-
+        int _fprintf_r(struct _reent *<[ptr]>, FILE *<[fd]>,
-	int printf(<[format]> [, <[arg]>, ...])
+                       const char *<[format]> [, <[arg]>, ...]);
-	char *<[format]>;
+        int _sprintf_r(struct _reent *<[ptr]>, char *<[str]>,
-
+                       const char *<[format]> [, <[arg]>, ...]);
-	int fprintf(<[fd]>, <[format]> [, <[arg]>, ...]);
+        int _snprintf_r(struct _reent *<[ptr]>, char *<[str]>, size_t <[size]>,
-	FILE *<[fd]>;
+                        const char *<[format]> [, <[arg]>, ...]);
-	char *<[format]>;
+        int _asprintf_r(struct _reent *<[ptr]>, char **<[strp]>,
-
+                        const char *<[format]> [, <[arg]>, ...]);
-	int asprintf(<[strp]>, <[format]> [, <[arg]>, ...]);
+        char *_asnprintf_r(struct _reent *<[ptr]>, char *<[str]>,
-	char **<[strp]>;
+                           size_t *<[size]>, const char *<[format]>
-	char *<[format]>;
+                           [, <[arg]>, ...]);
-
-	int sprintf(<[str]>, <[format]> [, <[arg]>, ...]);
-	char *<[str]>;
-	char *<[format]>;
-
-	int snprintf(<[str]>, size_t <[size]>, <[format]> [, <[arg]>, ...]);
-	char *<[str]>;
-        size_t <[size]>;
-	char *<[format]>;
 
 DESCRIPTION
         <<printf>> accepts a series of arguments, applies to each a
         format specifier from <<*<[format]>>>, and writes the
-        formatted data to <<stdout>>, terminated with a null character.
+        formatted data to <<stdout>>, without a terminating NUL
-        The behavior of <<printf>> is undefined if there are not enough
+        character.  The behavior of <<printf>> is undefined if there
-        arguments for the format.
+        are not enough arguments for the format.  <<printf>> returns
-        <<printf>> returns when it reaches the end of the format string.
+        when it reaches the end of the format string.  If there are
-        If there are more arguments than the format requires, excess
+        more arguments than the format requires, excess arguments are
-        arguments are ignored.
+        ignored.
 
-        <<fprintf>>, <<asprintf>>, <<sprintf>> and <<snprintf>> are identical 
+        <<fprintf>> is like <<printf>>, except that output is directed
-	to <<printf>>, other than the destination of the formatted output: 
+        to the stream <[fd]> rather than <<stdout>>.
-	<<fprintf>> sends the output to a specified file <[fd]>, while 
-	<<asprintf>> stores the output in a dynamically allocated buffer,
-	while <<sprintf>> stores the output in the specified char array 
-	<[str]> and <<snprintf>> limits number of characters written to 
-	<[str]> to at most <[size]> (including terminating <<0>>).  For 
-	<<sprintf>> and <<snprintf>>, the behavior is undefined if the 
-	output <<*<[str]>>> overlaps with one of the arguments. For
-	<<asprintf>>, <[strp]> points to a pointer to char which is filled
-	in with the dynamically allocated buffer.  <[format]> is a pointer 
-	to a charater string containing two types of objects: ordinary 
-	characters (other than <<%>>), which are copied unchanged to the 
-	output, and conversion specifications, each of which is introduced 
-	by <<%>>. (To include <<%>> in the output, use <<%%>> in the format 
-	string.) A conversion specification has the following form:
 
-.       %[<[flags]>][<[width]>][.<[prec]>][<[size]>][<[type]>]
+        <<sprintf>> is like <<printf>>, except that output is directed
+        to the buffer <[str]>, and a terminating NUL is output.
+        Behavior is undefined if more output is generated than the
+        buffer can hold.
 
-        The fields of the conversion specification have the following meanings:
+        <<snprintf>> is like <<sprintf>>, except that output is
+        limited to at most <[size]> bytes, including the terminating
+        <<NUL>>.  As a special case, if <[size]> is 0, <[str]> can be
+        NULL, and <<snprintf>> merely calculates how many bytes would
+        be printed.
+
+        <<asprintf>> is like <<sprintf>>, except that the output is
+        stored in a dynamically allocated buffer, <[pstr]>, which
+        should be freed later with <<free>>.
+
+        <<asnprintf>> is like <<sprintf>>, except that the return type
+        is either the original <[str]> if it was large enough, or a
+        dynamically allocated string if the output exceeds *<[size]>;
+        the length of the result is returned in *<[size]>.  When
+        dynamic allocation occurs, the contents of the original
+        <[str]> may have been modified.
+
+        For <<sprintf>>, <<snprintf>>, and <<asnprintf>>, the behavior
+	is undefined if the output <<*<[str]>>> overlaps with one of
+	the arguments.  Behavior is also undefined if the argument for
+	<<%n>> within <<*<[format]>>> overlaps another argument.
+
+        <[format]> is a pointer to a character string containing two
+	types of objects: ordinary characters (other than <<%>>),
+	which are copied unchanged to the output, and conversion
+	specifications, each of which is introduced by <<%>>. (To
+	include <<%>> in the output, use <<%%>> in the format string.)
+	A conversion specification has the following form:
+
+.       %[<[pos]>][<[flags]>][<[width]>][.<[prec]>][<[size]>]<[type]>
+
+        The fields of the conversion specification have the following
+        meanings:
 
         O+
+	o <[pos]>
+
+        Conversions normally consume arguments in the order that they
+        are presented.  However, it is possible to consume arguments
+        out of order, and reuse an argument for more than one
+        conversion specification (although the behavior is undefined
+        if the same argument is requested with different types), by
+        specifying <[pos]>, which is a decimal integer followed by
+        '$'.  The integer must be between 1 and <NL_ARGMAX> from
+        limits.h, and if argument <<%n$>> is requested, all earlier
+        arguments must be requested somewhere within <[format]>.  If
+        positional parameters are used, then all conversion
+        specifications except for <<%%>> must specify a position.
+
 	o <[flags]>
 
-	an optional sequence of characters which control
+	<[flags]> is an optional sequence of characters which control
-	output justification, numeric signs, decimal points,
+	output justification, numeric signs, decimal points, trailing
-	trailing zeroes, and octal and hex prefixes.
+	zeros, and octal and hex prefixes.  The flag characters are
-	The flag characters are minus (<<->>), plus (<<+>>),
+	minus (<<->>), plus (<<+>>), space ( ), zero (<<0>>), sharp
-	space ( ), zero (<<0>>), and sharp (<<#>>).  They can
+	(<<#>>), and quote (<<'>>).  They can appear in any
-	appear in any combination.
+	combination, although not all flags can be used for all
+	conversion specification types.
 
 		o+
+		o '
+			Since newlib only supports the C locale, this
+			flag has no effect in this implementation.
+			But in other locales, when <[type]> is <<i>>,
+			<<d>>, <<u>>, <<f>>, <<F>>, <<g>>, or <<G>>,
+			the locale-dependent thousand's separator is
+			inserted prior to zero padding.
+
 		o -
-		The result of the conversion is left justified, and the right is
+			The result of the conversion is left
-		padded with blanks.  If you do not use this flag, the result is right
+			justified, and the right is padded with
-		justified, and padded on the left.
+			blanks.  If you do not use this flag, the
+			result is right justified, and padded on the
+			left.
 
 	        o +
-		The result of a signed conversion (as determined by <[type]>)
+			The result of a signed conversion (as
-		will always begin with a plus or minus sign.  (If you do not use
+			determined by <[type]> of <<d>>, <<i>>, <<a>>,
-        this flag, positive values do not begin with a plus sign.)
+			<<A>>, <<e>>, <<E>>, <<f>>, <<F>>, <<g>>, or
+			<<G>>) will always begin with a plus or minus
+			sign.  (If you do not use this flag, positive
+			values do not begin with a plus sign.)
 
 		o " " (space)
-		If the first character of a signed conversion specification
+			If the first character of a signed conversion
-        is not a sign, or if a signed conversion results in no
+		        specification is not a sign, or if a signed
-		characters, the result will begin with a space.  If the
+		        conversion results in no characters, the
-        space ( ) flag and the plus (<<+>>) flag both appear,
+		        result will begin with a space.  If the space
-		the space flag is ignored.
+		        ( ) flag and the plus (<<+>>) flag both
+		        appear, the space flag is ignored.
 
 	        o 0
-		If the <[type]> character is <<d>>, <<i>>, <<o>>, <<u>>,
+			If the <[type]> character is <<d>>, <<i>>,
-		<<x>>, <<X>>, <<e>>, <<E>>, <<f>>, <<g>>, or <<G>>: leading zeroes,
+			<<o>>, <<u>>, <<x>>, <<X>>, <<a>>, <<A>>,
-		are used to pad the field width (following any indication of sign or
+			<<e>>, <<E>>, <<f>>, <<g>>, or <<G>>: leading
-		base); no spaces are used for padding.  If the zero (<<0>>) and
+			zeros are used to pad the field width
-		minus (<<->>) flags both appear, the zero (<<0>>) flag will
+			(following any indication of sign or base); no
-		be ignored.  For <<d>>, <<i>>, <<o>>, <<u>>, <<x>>, and <<X>>
+			spaces are used for padding.  If the zero
-		conversions, if a precision <[prec]> is specified, the zero (<<0>>)
+			(<<0>>) and minus (<<->>) flags both appear,
-        flag is ignored.
+			the zero (<<0>>) flag will be ignored.  For
+			<<d>>, <<i>>, <<o>>, <<u>>, <<x>>, and <<X>>
+			conversions, if a precision <[prec]> is
+			specified, the zero (<<0>>) flag is ignored.
 
-		Note that <<0>> is interpreted as a flag, not as the beginning
+			Note that <<0>> is interpreted as a flag, not
-        of a field width.
+		        as the beginning of a field width.
 
 	        o #
-		The result is to be converted to an alternative form, according
+			The result is to be converted to an
-		to the next character:
+			alternative form, according to the <[type]>
+			character:
 
 			o+
-		    o 0
+			o o
-			increases precision to force the first digit
+				Increases precision to force the first
-                        of the result to be a zero.
+				digit of the result to be a zero.
 
 			o x
-			a non-zero result will have a <<0x>> prefix.
+				A non-zero result will have a <<0x>>
+				prefix.
 
 			o X
-			a non-zero result will have a <<0X>> prefix.
+				A non-zero result will have a <<0X>>
+				prefix.
 
-			o e, E or f
+			o a, A, e, E, f, or F
-			The result will always contain a decimal point
+				The result will always contain a
-		        even if no digits follow the point.
+			        decimal point even if no digits follow
-                        (Normally, a decimal point appears only if a
+			        the point.  (Normally, a decimal point
-			digit follows it.)  Trailing zeroes are removed.
+			        appears only if a digit follows it.)
+			        Trailing zeros are removed.
 
 			o g or G
-			same as <<e>> or <<E>>, but trailing zeroes
+				The result will always contain a
-                        are not removed.
+			        decimal point even if no digits follow
+			        the point.  Trailing zeros are not
+			        removed.
 
 			o all others
-			undefined.
+				Undefined.
 
 			o-
 		o-
 
 	o <[width]>
 
-	  <[width]> is an optional minimum field width.  You can either
+		<[width]> is an optional minimum field width.  You can
-	  specify it directly as a decimal integer, or indirectly by
+		either specify it directly as a decimal integer, or
-          using instead an asterisk (<<*>>), in which case an <<int>>
+		indirectly by using instead an asterisk (<<*>>), in
-          argument is used as the field width.  Negative field widths
+		which case an <<int>> argument is used as the field
-          are not supported; if you attempt to specify a negative field
+		width.  If positional arguments are used, then the
-          width, it is interpreted as a minus (<<->>) flag followed by a
+		width must also be specified positionally as <<*m$>>,
-          positive field width.
+		with m as a decimal integer.  Negative field widths
+		are treated as specifying the minus (<<->>) flag for
+		left justfication, along with a positive field width.
+		The resulting format may be wider than the specified
+		width.
 
 	o <[prec]>
 
-	  an optional field; if present, it is introduced with `<<.>>'
+		<[prec]> is an optional field; if present, it is
-	  (a period). This field gives the maximum number of
+		introduced with `<<.>>' (a period). You can specify
-	  characters to print in a conversion; the minimum number of
-	  digits of an integer to print, for conversions with <[type]>
-	  <<d>>, <<i>>, <<o>>, <<u>>, <<x>>, and <<X>>; the maximum number of
-	  significant digits, for the <<g>> and <<G>> conversions;
-	  or the number of digits to print after the decimal
-	  point, for <<e>>, <<E>>, and <<f>> conversions.  You can specify
 		the precision either directly as a decimal integer or
 		indirectly by using an asterisk (<<*>>), in which case
-	  an <<int>> argument is used as the precision.  Supplying a negative
+		an <<int>> argument is used as the precision.  If
-      precision is equivalent to omitting the precision.
+		positional arguments are used, then the precision must
-	  If only a period is specified the precision is zero.
+		also be specified positionally as <<*m$>>, with m as a
-	  If a precision appears with any other conversion <[type]>
+		decimal integer.  Supplying a negative precision is
-	  than those listed here, the behavior is undefined.
+		equivalent to omitting the precision.  If only a
+		period is specified the precision is zero. The effect
+		depends on the conversion <[type]>.
+
+		o+
+		o d, i, o, u, x, or X
+			Minimum number of digits to appear.  If no
+			precision is given, defaults to 1.
+
+		o a or A
+			Number of digits to appear after the decimal
+			point.  If no precision is given, the
+			precision defaults to the minimum needed for
+			an exact representation.
+
+		o e, E, f or F
+			Number of digits to appear after the decimal
+			point.  If no precision is given, the
+			precision defaults to 6.
+
+		o g or G
+			Maximum number of significant digits.  A
+			precision of 0 is treated the same as a
+			precision of 1.  If no precision is given, the
+			precision defaults to 6.
+
+		o s or S
+			Maximum number of characters to print from the
+			string.  If no precision is given, the entire
+			string is printed.
+
+		o all others
+			undefined.
+
+		o-
 
 	o <[size]>
 
-		<<h>>, <<l>>, and <<L>> are optional size characters which
+		<[size]> is an optional modifier that changes the data
-		override the default way that <<printf>> interprets the
+		type that the corresponding argument has.  Behavior is
-		data type of the corresponding argument.  <<h>> forces
+		unspecified if a size is given that does not match the
-		the following <<d>>, <<i>>, <<o>>, <<u>>, <<x>> or <<X>> conversion
+		<[type]>.
-		<[type]> to apply to a <<short>> or <<unsigned short>>. <<h>> also
+
-		forces a following <<n>> <[type]> to apply to
+		o+
-		a pointer to a <<short>>. Similarily, an
+		o hh
-		<<l>> forces the following <<d>>, <<i>>, <<o>>, <<u>>,
+			With <<d>>, <<i>>, <<o>>, <<u>>, <<x>>, or
-		<<x>> or <<X>> conversion <[type]> to apply to a <<long>> or
+			<<X>>, specifies that the argument should be
-		<<unsigned long>>.  <<l>> also forces a following <<n>> <[type]> to
+			converted to a <<signed char>> or <<unsigned
-		apply to a pointer to a <<long>>.  <<l>> with <<c>>, <<s>> is
+			char>> before printing.
-		equivalent to <<C>>, <<S>> respectively.  If an <<h>>
+
-		or an <<l>> appears with another conversion
+			With <<n>>, specifies that the argument is a
-		specifier, the behavior is undefined.  <<L>> forces a
+			pointer to a <<signed char>>.
-		following <<e>>, <<E>>, <<f>>, <<g>> or <<G>> conversion <[type]> to
+
-		apply to a <<long double>> argument.  If <<L>> appears with
+		o h
-		any other conversion <[type]>, the behavior is undefined.
+			With <<d>>, <<i>>, <<o>>, <<u>>, <<x>>, or
+			<<X>>, specifies that the argument should be
+			converted to a <<short>> or <<unsigned short>>
+			before printing.
+
+			With <<n>>, specifies that the argument is a
+			pointer to a <<short>>.
+
+		o l
+			With <<d>>, <<i>>, <<o>>, <<u>>, <<x>>, or
+			<<X>>, specifies that the argument is a
+			<<long>> or <<unsigned long>>.
+
+			With <<c>>, specifies that the argument has
+			type <<wint_t>>.
+
+			With <<s>>, specifies that the argument is a
+			pointer to <<wchar_t>>.
+
+			With <<n>>, specifies that the argument is a
+			pointer to a <<long>>.
+
+			With <<a>>, <<A>>, <<e>>, <<E>>, <<f>>, <<F>>,
+			<<g>>, or <<G>>, has no effect (because of
+			vararg promotion rules, there is no need to
+			distinguish between <<float>> and <<double>>).
+
+		o ll
+			With <<d>>, <<i>>, <<o>>, <<u>>, <<x>>, or
+			<<X>>, specifies that the argument is a
+			<<long long>> or <<unsigned long long>>.
+
+			With <<n>>, specifies that the argument is a
+			pointer to a <<long long>>.
+
+		o j
+			With <<d>>, <<i>>, <<o>>, <<u>>, <<x>>, or
+			<<X>>, specifies that the argument is an
+			<<intmax_t>> or <<uintmax_t>>.
+
+			With <<n>>, specifies that the argument is a
+			pointer to an <<intmax_t>>.
+
+		o z
+			With <<d>>, <<i>>, <<o>>, <<u>>, <<x>>, or
+			<<X>>, specifies that the argument is a
+			<<ssize_t>> or <<size_t>>.
+
+			With <<n>>, specifies that the argument is a
+			pointer to a <<ssize_t>>.
+
+		o t
+			With <<d>>, <<i>>, <<o>>, <<u>>, <<x>>, or
+			<<X>>, specifies that the argument is a
+			<<ptrdiff_t>>.
+
+			With <<n>>, specifies that the argument is a
+			pointer to a <<ptrdiff_t>>.
+
+		o L
+			With <<a>>, <<A>>, <<e>>, <<E>>, <<f>>, <<F>>,
+			<<g>>, or <<G>>, specifies that the argument
+			is a <<long double>>.
+
+		o-
 
 	o   <[type]>
 
-		<[type]> specifies what kind of conversion <<printf>> performs.
+		<[type]> specifies what kind of conversion <<printf>>
-		Here is a table of these:
+		performs.  Here is a table of these:
 
 		o+
 		o %
-		prints the percent character (<<%>>)
+			Prints the percent character (<<%>>).
 
 		o c
-		prints <[arg]> as single character
+			Prints <[arg]> as single character.  If the
+			<<l>> size specifier is in effect, a multibyte
+			character is printed.
 
 		o C
-		prints wchar_t <[arg]> as single multibyte character
+			Short for <<%lc>>.
 
 		o s
-		prints characters until precision is reached or a null terminator
+			Prints the elements of a pointer to <<char>>
-		is encountered; takes a string pointer
+			until the precision or a null character is
+			reached.  If the <<l>> size specifier is in
+			effect, the pointer is to an array of
+			<<wchar_t>>, and the string is converted to
+			multibyte characters before printing.
 
 		o S
-		converts wchar_t characters to multibyte output characters until
+			Short for <<%ls>>.
-		precision is reached or a null wchar_t terminator
-		is encountered; takes a wchar_t pointer
 
-		o d
+		o d or i
-		prints a signed decimal integer; takes an <<int>> (same as <<i>>)
+			Prints a signed decimal integer; takes an
+			<<int>>.  Leading zeros are inserted as
+			necessary to reach the precision.  A precision
+			of 0 produces an empty string.
 
-		o i
+		o D
-		prints a signed decimal integer; takes an <<int>> (same as <<d>>)
+			Newlib extension, short for <<%ld>>.
 
 		o o
-		prints a signed octal integer; takes an <<int>>
+			Prints an unsigned octal integer; takes an
+			<<unsigned>>.  Leading zeros are inserted as
+			necessary to reach the precision.  A precision
+			of 0 produces an empty string.
+
+		o O
+			Newlib extension, short for <<%lo>>.
 
 		o u
-		prints an unsigned decimal integer; takes an <<int>>
+			Prints an unsigned decimal integer; takes an
+			<<unsigned>>.  Leading zeros are inserted as
+			necessary to reach the precision.  A precision
+			of 0 produces an empty string.
+
+		o U
+			Newlib extension, short for <<%lu>>.
 
 		o x
-		prints an unsigned hexadecimal integer (using <<abcdef>> as
+			Prints an unsigned hexadecimal integer (using
-		digits beyond <<9>>); takes an <<int>>
+			<<abcdef>> as digits beyond <<9>>); takes an
+			<<unsigned>>.  Leading zeros are inserted as
+			necessary to reach the precision.  A precision
+			of 0 produces an empty string.
 
 		o X
-		prints an unsigned hexadecimal integer (using <<ABCDEF>> as
+			Like <<x>>, but uses <<ABCDEF>> as digits
-		digits beyond <<9>>); takes an <<int>>
+			beyond <<9>>.
 
 		o f
-		prints a signed value of the form <<[-]9999.9999>>; takes
+			Prints a signed value of the form
-		a floating-point number
+			<<[-]9999.9999>>, with the precision
+			determining how many digits follow the decimal
+			point; takes a <<double>> (remember that
+			<<float>> promotes to <<double>> as a vararg).
+			The low order digit is rounded to even.  If
+			the precision results in at most DECIMAL_DIG
+			digits, the result is rounded correctly; if
+			more than DECIMAL_DIG digits are printed, the
+			result is only guaranteed to round back to the
+			original value.
+
+			If the value is infinite, the result is
+			<<inf>>, and no zero padding is performed.  If
+			the value is not a number, the result is
+			<<nan>>, and no zero padding is performed.
+
+		o F
+			Like <<f>>, but uses <<INF>> and <<NAN>> for
+			non-finite numbers.
 
 		o e
-		prints a signed	value of the form <<[-]9.9999e[+|-]999>>; takes a
+			Prints a signed value of the form
-		floating-point number
+			<<[-]9.9999e[+|-]999>>; takes a <<double>>.
+			The digit before the decimal point is non-zero
+			if the value is non-zero.  The precision
+			determines how many digits appear between
+			<<.>> and <<e>>, and the exponent always
+			contains at least two digits.  The value zero
+			has an exponent of zero.  If the value is not
+			finite, it is printed like <<f>>.
 
 		o E
-		prints the same way as <<e>>, but using <<E>> to introduce the
+			Like <<e>>, but using <<E>> to introduce the
-		exponent; takes a floating-point number
+			exponent, and like <<F>> for non-finite
+			values.
 
 		o g
-		prints a signed value in either <<f>> or <<e>> form, based on given
+			Prints a signed value in either <<f>> or <<e>>
-		value and precision---trailing zeros and the decimal point are
+			form, based on the given value and
-		printed only if necessary; takes a floating-point number
+			precision---an exponent less than -4 or
+			greater than the precision selects the <<e>>
+			form.  Trailing zeros and the decimal point
+			are printed only if necessary; takes a
+			<<double>>.
 
 		o G
-		prints the same way as <<g>>, but using <<E>> for the exponent if an
+			Like <<g>>, except use <<F>> or <<E>> form.
-		exponent is needed; takes a floating-point number
+
+		o a
+			Prints a signed value of the form
+			<<[-]0x1.ffffp[+|-]9>>; takes a <<double>>.
+			The letters <<abcdef>> are used for digits
+			beyond <<9>>.  The precision determines how
+			many digits appear after the decimal point.
+			The exponent contains at least one digit, and
+			is a decimal value representing the power of
+			2; a value of 0 has an exponent of 0.
+			Non-finite values are printed like <<f>>.
+
+		o A
+			Like <<a>>, except uses <<X>>, <<P>>, and
+			<<ABCDEF>> instead of lower case.
 
 		o n
-		stores (in the same object) a count of the characters written;
+			Takes a pointer to <<int>>, and stores a count
-		takes a pointer to <<int>>
+			of the number of bytes written so far.  No
+			output is created.
 
 		o p
-		prints a pointer in an implementation-defined format.
+			Takes a pointer to <<void>>, and prints it in
-		This implementation treats the pointer as an
+			an implementation-defined format.  This
-		<<unsigned long>> (same as <<Lu>>).
+			implementation is similar to <<%#tx>>), except
-	o-
+			that <<0x>> appears even for the NULL pointer.
-O-
 
+		o-
+	O-
+
+        <<_printf_r>>, <<_fprintf_r>>, <<_asprintf_r>>,
+        <<_sprintf_r>>, <<_snprintf_r>>, <<_asnprintf_r>> are simply
+        reentrant versions of the functions above.
 
 RETURNS
-<<sprintf>> and <<asprintf>> return the number of bytes in the output string,
+On success, <<sprintf>> and <<asprintf>> return the number of bytes in
-save that the concluding <<NULL>> is not counted.
+the output string, except the concluding <<NUL>> is not counted.
-<<printf>> and <<fprintf>> return the number of characters transmitted.
+<<snprintf>> returns the number of bytes that would be in the output
-If an error occurs, <<printf>> and <<fprintf>> return <<EOF>> and
+string, except the concluding <<NUL>> is not counted.  <<printf>> and
-<<asprintf>> returns -1.  No error returns occur for <<sprintf>>.
+<<fprintf>> return the number of characters transmitted.
+<<asnprintf>> returns the original <[str]> if there was enough room,
+otherwise it returns an allocated string.
+
+If an error occurs, the result of <<printf>>, <<fprintf>>,
+<<snprintf>>, and <<asprintf>> is a negative value, and the result of
+<<asnprintf>> is NULL.  No error returns occur for <<sprintf>>.  For
+<<printf>> and <<fprintf>>, <<errno>> may be set according to
+<<fputc>>.  For <<asprintf>> and <<asnprintf>>, <<errno>> may be set
+to ENOMEM if allocation fails, and for <<snprintf>>, <<errno>> may be
+set to EOVERFLOW if <[size]> or the output length exceeds INT_MAX.
 
 PORTABILITY
-        The  ANSI C standard specifies that implementations must
+ANSI C requires <<printf>>, <<fprintf>>, <<sprintf>>, and
-        support at least formatted output of up to 509 characters.
+<<snprintf>>.  <<asprintf>> and <<asnprintf>> are newlib extensions.
+
+The ANSI C standard specifies that implementations must support at
+least formatted output of up to 509 characters.  This implementation
+has no inherent limit.
+
+Depending on how newlib was configured, not all format specifiers are
+supported.
 
 Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 <<lseek>>, <<read>>, <<sbrk>>, <<write>>.

newlib/libc/stdio/vasniprintf.c

@@ -0,0 +1,69 @@
+/* Copyright (C) 2007 Eric Blake
+ * Permission to use, copy, modify, and distribute this software
+ * is freely granted, provided that this notice is preserved.
+ */
+/* This code was derived from asprintf.c */
+/* doc in viprintf.c */
+
+#include <_ansi.h>
+#include <reent.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <limits.h>
+#include <errno.h>
+
+char *
+_DEFUN(_vasniprintf_r, (ptr, buf, lenp, fmt, ap),
+       struct _reent *ptr _AND
+       char *buf _AND
+       size_t *lenp _AND
+       const char *fmt _AND
+       va_list ap)
+{
+  int ret;
+  FILE f;
+  size_t len = *lenp;
+
+  if (buf && len)
+    {
+      /* mark an existing buffer, but allow allocation of larger string */
+      f._flags = __SWR | __SSTR | __SOPT;
+    }
+  else
+    {
+      /* mark a zero-length reallocatable buffer */
+      f._flags = __SWR | __SSTR | __SMBF;
+      len = 0;
+    }
+  f._bf._base = f._p = (unsigned char *) buf;
+  /* For now, inherit the 32-bit signed limit of FILE._bf._size.
+     FIXME - it would be nice to rewrite sys/reent.h to support size_t
+     for _size.  */
+  if (len > INT_MAX)
+    {
+      ptr->_errno = EOVERFLOW;
+      return NULL;
+    }
+  f._bf._size = f._w = len;
+  f._file = -1;  /* No file. */
+  ret = _vfiprintf_r (ptr, &f, fmt, ap);
+  if (ret < 0)
+    return NULL;
+  *lenp = ret;
+  *f._p = '\0';
+  return (char *) f._bf._base;
+}
+
+#ifndef _REENT_ONLY
+
+char *
+_DEFUN(vasniprintf, (buf, lenp, fmt, ap),
+       char *buf _AND
+       size_t *lenp _AND
+       const char *fmt _AND
+       va_list ap)
+{
+  return _vasniprintf_r (_REENT, buf, lenp, fmt, ap);
+}
+
+#endif /* ! _REENT_ONLY */

newlib/libc/stdio/vasnprintf.c

@@ -0,0 +1,69 @@
+/* Copyright (C) 2007 Eric Blake
+ * Permission to use, copy, modify, and distribute this software
+ * is freely granted, provided that this notice is preserved.
+ */
+/* This code was derived from asprintf.c */
+/* doc in vfprintf.c */
+
+#include <_ansi.h>
+#include <reent.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <limits.h>
+#include <errno.h>
+
+char *
+_DEFUN(_vasnprintf_r, (ptr, buf, lenp, fmt, ap),
+       struct _reent *ptr _AND
+       char *buf _AND
+       size_t *lenp _AND
+       const char *fmt _AND
+       va_list ap)
+{
+  int ret;
+  FILE f;
+  size_t len = *lenp;
+
+  if (buf && len)
+    {
+      /* mark an existing buffer, but allow allocation of larger string */
+      f._flags = __SWR | __SSTR | __SOPT;
+    }
+  else
+    {
+      /* mark a zero-length reallocatable buffer */
+      f._flags = __SWR | __SSTR | __SMBF;
+      len = 0;
+    }
+  f._bf._base = f._p = (unsigned char *) buf;
+  /* For now, inherit the 32-bit signed limit of FILE._bf._size.
+     FIXME - it would be nice to rewrite sys/reent.h to support size_t
+     for _size.  */
+  if (len > INT_MAX)
+    {
+      ptr->_errno = EOVERFLOW;
+      return NULL;
+    }
+  f._bf._size = f._w = len;
+  f._file = -1;  /* No file. */
+  ret = _vfprintf_r (ptr, &f, fmt, ap);
+  if (ret < 0)
+    return NULL;
+  *lenp = ret;
+  *f._p = '\0';
+  return (char *) f._bf._base;
+}
+
+#ifndef _REENT_ONLY
+
+char *
+_DEFUN(vasnprintf, (buf, lenp, fmt, ap),
+       char *buf _AND
+       size_t *lenp _AND
+       const char *fmt _AND
+       va_list ap)
+{
+  return _vasnprintf_r (_REENT, buf, lenp, fmt, ap);
+}
+
+#endif /* ! _REENT_ONLY */

newlib/libc/stdio/vdiprintf.c

@@ -2,6 +2,7 @@
  * Permission to use, copy, modify, and distribute this software
  * is freely granted, provided that this notice is preserved.
  */
+/* doc in diprintf.c */
 
 #include <_ansi.h>
 #include <reent.h>
@@ -18,12 +19,15 @@ _DEFUN(_vdiprintf_r, (ptr, fd, format, ap),
        va_list ap)
 {
   char *p;
-  int n;
+  char buf[512];
+  size_t n = sizeof buf;
 
   _REENT_SMALL_CHECK_INIT (ptr);
-  n = _vasiprintf_r (ptr, &p, format, ap);
+  p = _vasniprintf_r (ptr, buf, &n, format, ap);
-  if (n == -1) return -1;
+  if (!p)
+    return -1;
   n = _write_r (ptr, fd, p, n);
+  if (p != buf)
     _free_r (ptr, p);
   return n;
 }

newlib/libc/stdio/vdprintf.c

@@ -2,6 +2,7 @@
  * Permission to use, copy, modify, and distribute this software
  * is freely granted, provided that this notice is preserved.
  */
+/* doc in dprintf.c */
 
 #include <_ansi.h>
 #include <reent.h>
@@ -18,13 +19,15 @@ _DEFUN(_vdprintf_r, (ptr, fd, format, ap),
        va_list ap)
 {
   char *p;
-  int n;
+  char buf[512];
+  size_t n = sizeof buf;
 
   _REENT_SMALL_CHECK_INIT (ptr);
-  n = _vasprintf_r (ptr, &p, format, ap);
+  p = _vasnprintf_r (ptr, buf, &n, format, ap);
-  if (n == -1)
+  if (!p)
     return -1;
   n = _write_r (ptr, fd, p, n);
+  if (p != buf)
     _free_r (ptr, p);
   return n;
 }

newlib/libc/stdio/vfprintf.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1990, 2006 The Regents of the University of California.
+ * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
@@ -36,7 +36,7 @@
 
 /*
 FUNCTION
-<<vprintf>>, <<vfprintf>>, <<vsprintf>>---format argument list
+<<vprintf>>, <<vfprintf>>, <<vsprintf>>, <<vsnprintf>>, <<vasprintf>>, vasnprintf>>---format argument list
 
 INDEX
 	vprintf
@@ -46,6 +46,10 @@ INDEX
 	vsprintf
 INDEX
 	vsnprintf
+INDEX
+	vasprintf
+INDEX
+	vasnprintf
 
 ANSI_SYNOPSIS
 	#include <stdio.h>
@@ -53,96 +57,46 @@ ANSI_SYNOPSIS
 	int vprintf(const char *<[fmt]>, va_list <[list]>);
 	int vfprintf(FILE *<[fp]>, const char *<[fmt]>, va_list <[list]>);
 	int vsprintf(char *<[str]>, const char *<[fmt]>, va_list <[list]>);
-	int vasprintf(char **<[strp]>, const char *<[fmt]>, va_list <[list]>);
 	int vsnprintf(char *<[str]>, size_t <[size]>, const char *<[fmt]>,
                       va_list <[list]>);
+	int vasprintf(char **<[strp]>, const char *<[fmt]>, va_list <[list]>);
+	char *vasnprintf(char *<[str]>, size_t *<[size]>, const char *<[fmt]>,
+                         va_list <[list]>);
 
 	int _vprintf_r(struct _reent *<[reent]>, const char *<[fmt]>,
                         va_list <[list]>);
-	int _vfprintf_r(struct _reent *<[reent]>, FILE *<[fp]>, const char *<[fmt]>,
+	int _vfprintf_r(struct _reent *<[reent]>, FILE *<[fp]>,
-                        va_list <[list]>);
-	int _vasprintf_r(struct _reent *<[reent]>, char **<[str]>,
                         const char *<[fmt]>, va_list <[list]>);
 	int _vsprintf_r(struct _reent *<[reent]>, char *<[str]>,
                         const char *<[fmt]>, va_list <[list]>);
-	int _vsnprintf_r(struct _reent *<[reent]>, char *<[str]>, size_t <[size]>,
+	int _vasprintf_r(struct _reent *<[reent]>, char **<[str]>,
                          const char *<[fmt]>, va_list <[list]>);
-
+	int _vsnprintf_r(struct _reent *<[reent]>, char *<[str]>,
-TRAD_SYNOPSIS
+                         size_t <[size]>, const char *<[fmt]>,
-	#include <stdio.h>
+                         va_list <[list]>);
-	#include <varargs.h>
+	char *_vasnprintf_r(struct _reent *<[reent]>, char *<[str]>,
-	int vprintf( <[fmt]>, <[list]>)
+                            size_t *<[size]>, const char *<[fmt]>,
-	char *<[fmt]>;
+                            va_list <[list]>);
-	va_list <[list]>;
-
-	int vfprintf(<[fp]>, <[fmt]>, <[list]>)
-	FILE *<[fp]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int vasprintf(<[strp]>, <[fmt]>, <[list]>)
-	char **<[strp]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int vsprintf(<[str]>, <[fmt]>, <[list]>)
-	char *<[str]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int vsnprintf(<[str]>, <[size]>, <[fmt]>, <[list]>)
-	char *<[str]>;
-        size_t <[size]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _vprintf_r(<[reent]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _vfprintf_r(<[reent]>, <[fp]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
-	FILE *<[fp]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _vasprintf_r(<[reent]>, <[strp]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
-	char **<[strp]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _vsprintf_r(<[reent]>, <[str]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
-	char *<[str]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _vsnprintf_r(<[reent]>, <[str]>, <[size]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
-	char *<[str]>;
-        size_t <[size]>;
-	char *<[fmt]>;
-	va_list <[list]>;
 
 DESCRIPTION
-<<vprintf>>, <<vfprintf>>, <<vasprintf>>, <<vsprintf>> and <<vsnprintf>> are 
+<<vprintf>>, <<vfprintf>>, <<vasprintf>>, <<vsprintf>>, <<vsnprintf>>,
-(respectively) variants of <<printf>>, <<fprintf>>, <<asprintf>>, <<sprintf>>,
+and <<vasnprintf>> are (respectively) variants of <<printf>>,
-and <<snprintf>>.  They differ only in allowing their caller to pass the 
+<<fprintf>>, <<asprintf>>, <<sprintf>>, <<snprintf>>, and
-variable argument list as a <<va_list>> object (initialized by <<va_start>>) 
+<<asnprintf>>.  They differ only in allowing their caller to pass the
-rather than directly accepting a variable number of arguments.
+variable argument list as a <<va_list>> object (initialized by
+<<va_start>>) rather than directly accepting a variable number of
+arguments.  The caller is responsible for calling <<va_end>>.
+
+<<_vprintf_r>>, <<_vfprintf_r>>, <<_vasprintf_r>>, <<_vsprintf_r>>,
+<<_vsnprintf_r>>, and <<_vasnprintf_r>> are reentrant versions of the
+above.
 
 RETURNS
-The return values are consistent with the corresponding functions:
+The return values are consistent with the corresponding functions.
-<<vasprintf>>/<<vsprintf>> returns the number of bytes in the output string,
-save that the concluding <<NULL>> is not counted.
-<<vprintf>> and <<vfprintf>> return the number of characters transmitted.
-If an error occurs, <<vprintf>> and <<vfprintf>> return <<EOF>> and
-<<vasprintf>> returns -1.  No error returns occur for <<vsprintf>>.
 
 PORTABILITY
-ANSI C requires all three functions.
+ANSI C requires <<vprintf>>, <<vfprintf>>, <<vsprintf>>, and
+<<vsnprintf>>.  The remaining functions are newlib extensions.
 
 Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 <<lseek>>, <<read>>, <<sbrk>>, <<write>>.
@@ -1247,13 +1201,13 @@ number:			if ((dprec = prec) >= 0)
 				if (_fpvalue == 0) {
 					/* kludge for __dtoa irregularity */
 					PRINT ("0", 1);
-					if (expt < ndig || (flags & ALT) != 0) {
+					if (expt < ndig || flags & ALT) {
 						PRINT (decimal_point, 1);
 						PAD (ndig - 1, zeroes);
 					}
 				} else if (expt <= 0) {
 					PRINT ("0", 1);
-					if(expt || ndig || (flags & ALT)) {
+					if (expt || ndig || flags & ALT) {
 						PRINT (decimal_point, 1);
 						PAD (-expt, zeroes);
 						PRINT (cp, ndig);
@@ -1267,7 +1221,7 @@ number:			if ((dprec = prec) >= 0)
 					PRINT (cp, expt);
 					cp += expt;
 					PRINT (".", 1);
-					PRINT (cp, ndig-expt);
+					PRINT (cp, ndig - expt);
 				}
 			} else {	/* 'e' or 'E' */
 				if (ndig > 1 || flags & ALT) {
@@ -1275,7 +1229,7 @@ number:			if ((dprec = prec) >= 0)
 					ox[1] = '.';
 					PRINT (ox, 2);
 					if (_fpvalue) {
-						PRINT (cp, ndig-1);
+						PRINT (cp, ndig - 1);
 					} else	/* 0.[0..] */
 						/* __dtoa irregularity */
 						PAD (ndig - 1, zeroes);

newlib/libc/stdio/viprintf.c

@@ -17,7 +17,7 @@
 
 /*
 FUNCTION
-<<viprintf>>, <<vfiprintf>>, <<vsiprintf>>---format argument list
+<<viprintf>>, <<vfiprintf>>, <<vsiprintf>>, <<vsniprintf>>, <<vasiprintf>>, <<vasniprintf>>---format argument list (integer only)
 
 INDEX
 	viprintf
@@ -27,6 +27,10 @@ INDEX
 	vsiprintf
 INDEX
 	vsniprintf
+INDEX
+	vasiprintf
+INDEX
+	vasniprintf
 
 ANSI_SYNOPSIS
 	#include <stdio.h>
@@ -34,96 +38,45 @@ ANSI_SYNOPSIS
 	int viprintf(const char *<[fmt]>, va_list <[list]>);
 	int vfiprintf(FILE *<[fp]>, const char *<[fmt]>, va_list <[list]>);
 	int vsiprintf(char *<[str]>, const char *<[fmt]>, va_list <[list]>);
-	int vasiprintf(char **<[strp]>, const char *<[fmt]>, va_list <[list]>);
 	int vsniprintf(char *<[str]>, size_t <[size]>, const char *<[fmt]>,
                        va_list <[list]>);
+	int vasiprintf(char **<[strp]>, const char *<[fmt]>, va_list <[list]>);
+	char *vasniprintf(char *<[str]>, size_t *<[size]>, const char *<[fmt]>,
+                          va_list <[list]>);
 
 	int _viprintf_r(struct _reent *<[reent]>, const char *<[fmt]>,
                         va_list <[list]>);
 	int _vfiprintf_r(struct _reent *<[reent]>, FILE *<[fp]>,
                         const char *<[fmt]>, va_list <[list]>);
-	int _vasiprintf_r(struct _reent *<[reent]>, char **<[str]>,
-                        const char *<[fmt]>, va_list <[list]>);
 	int _vsiprintf_r(struct _reent *<[reent]>, char *<[str]>,
                         const char *<[fmt]>, va_list <[list]>);
-	int _vsniprintf_r(struct _reent *<[reent]>, char *<[str]>, size_t <[size]>,
+	int _vsniprintf_r(struct _reent *<[reent]>, char *<[str]>,
+                          size_t <[size]>, const char *<[fmt]>,
+                          va_list <[list]>);
+	int _vasiprintf_r(struct _reent *<[reent]>, char **<[str]>,
                           const char *<[fmt]>, va_list <[list]>);
-
+	char *_vasniprintf_r(struct _reent *<[reent]>, char *<[str]>,
-TRAD_SYNOPSIS
+                             size_t *<[size]>, const char *<[fmt]>,
-	#include <stdio.h>
+                             va_list <[list]>);
-	#include <varargs.h>
-	int viprintf( <[fmt]>, <[list]>)
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int vfiprintf(<[fp]>, <[fmt]>, <[list]>)
-	FILE *<[fp]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int vasiprintf(<[strp]>, <[fmt]>, <[list]>)
-	char **<[strp]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int vsiprintf(<[str]>, <[fmt]>, <[list]>)
-	char *<[str]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int vsniprintf(<[str]>, <[size]>, <[fmt]>, <[list]>)
-	char *<[str]>;
-        size_t <[size]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _viprintf_r(<[reent]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _vfiprintf_r(<[reent]>, <[fp]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
-	FILE *<[fp]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _vasiprintf_r(<[reent]>, <[strp]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
-	char **<[strp]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _vsiprintf_r(<[reent]>, <[str]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
-	char *<[str]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _vsniprintf_r(<[reent]>, <[str]>, <[size]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
-	char *<[str]>;
-        size_t <[size]>;
-	char *<[fmt]>;
-	va_list <[list]>;
 
 DESCRIPTION
-<<viprintf>>, <<vfiprintf>>, <<vasiprintf>>, <<vsiprintf>> and 
+<<viprintf>>, <<vfiprintf>>, <<vasiprintf>>, <<vsiprintf>>,
-<<vsniprintf>> are (respectively) variants of <<iprintf>>, <<fiprintf>>, 
+<<vsniprintf>>, and <<vasniprintf>> are (respectively) variants of
-<<asiprintf>>, <<siprintf>>, and <<sniprintf>>.  They differ only in 
+<<iprintf>>, <<fiprintf>>, <<asiprintf>>, <<siprintf>>, <<sniprintf>>,
-restricting the caller to use non-floating-point format specifiers.
+and <<asniprintf>>.  They differ only in allowing their caller to pass
+the variable argument list as a <<va_list>> object (initialized by
+<<va_start>>) rather than directly accepting a variable number of
+arguments.  The caller is responsible for calling <<va_end>>.
+
+<<_viprintf_r>>, <<_vfiprintf_r>>, <<_vasiprintf_r>>,
+<<_vsiprintf_r>>, <<_vsniprintf_r>>, and <<_vasniprintf_r>> are
+reentrant versions of the above.
 
 RETURNS
 The return values are consistent with the corresponding functions:
-<<vasiprintf>>/<<vsiprintf>> returns the number of bytes in the output string,
-save that the concluding <<NULL>> is not counted.
-<<viprintf>> and <<vfiprintf>> return the number of characters transmitted.
-If an error occurs, <<viprintf>> and <<vfiprintf>> return <<EOF>> and
-<<vasiprintf>> returns -1.  No error returns occur for <<vsiprintf>>.
 
 PORTABILITY
-<<viprintf>>, <<vfiprintf>>, <<vasiprintf>>, <<vsiprintf>> and <<vsniprintf>>
+All of these functions are newlib extensions.
-are newlib extensions.
 
 Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 <<lseek>>, <<read>>, <<sbrk>>, <<write>>.

newlib/libc/stdio/vsiprintf.c

@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
-/* doc in vfiprintf.c */
+/* doc in viprintf.c */
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "%W% (Berkeley) %G%";

newlib/libc/stdio/vsniprintf.c

@@ -14,46 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
-
+/* doc in viprintf.c */
-/*
-FUNCTION
-<<vsniprintf>>---write formatted output (integer only)
-
-INDEX
-	vsniprintf
-
-ANSI_SYNOPSIS
-        #include <stdio.h>
-
-        int vsniprintf(char *<[str]>, size_t <[size]>, const char *<[fmt]>, va_list <[list]>);
-
-TRAD_SYNOPSIS
-        #include <stdio.h>
-
-        int vsnprintf(<[str]>, <[size]>, <[fmt]>, <[list]>)
-        char *<[str]>;
-        size_t <[size]>;
-        char *<[fmt]>;
-        va_list <[list]>;
-
-DESCRIPTION
-<<vsniprintf>> is a restricted version of <<vsnprintf>>: it has the same
-arguments and behavior, save that it cannot perform any floating-point
-formatting: the <<f>>, <<g>>, <<G>>, <<e>>, and <<F>> type specifiers
-are not recognized.
-
-RETURNS
-        <<vsniprintf>> returns the number of bytes in the output string,
-        save that the concluding <<NULL>> is not counted.
-        <<vsniprintf>> returns when the end of the format string is
-        encountered.
-
-PORTABILITY
-<<vsniprintf>> is not required by ANSI C.
-
-Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
-<<lseek>>, <<read>>, <<sbrk>>, <<write>>.
-*/
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "%W% (Berkeley) %G%";