about summary refs log tree commit diff
path: root/stdio-common/vfprintf.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-08-15 16:50:20 +0000
committerUlrich Drepper <drepper@redhat.com>1999-08-15 16:50:20 +0000
commit0cc70fcf82fefca2d186af4de0b6625a62dd31a0 (patch)
tree4dc645922acf5cffe0a6d7dd8097528c8a8ea946 /stdio-common/vfprintf.c
parentf4b8246c52db6b75dc871ef2f87f41e1bef1f7db (diff)
downloadglibc-0cc70fcf82fefca2d186af4de0b6625a62dd31a0.tar.gz
glibc-0cc70fcf82fefca2d186af4de0b6625a62dd31a0.tar.xz
glibc-0cc70fcf82fefca2d186af4de0b6625a62dd31a0.zip
Update.
1999-08-10  H.J. Lu  <hjl@gnu.org>

	* resolv/nss_dns/dns-host.c (getanswer_r): Cleanup out-of-
	buffer handling.

1999-08-15  Ulrich Drepper  <drepper@cygnus.com>

	* elf/elf.h: Define ElfXX_Versym.
	* elf/link.h (struct link_map): Use ElfXX_Versym for l_versyms
	definition.

	* stdio-common/vfprintf.c (process_string_arg): Handle precisions
	for string output correctly in the wide character case.
	Patch by Akira YOSHIYAMA <yosshy@tkf.att.ne.jp>.

	* intl/locale.alias: Add catalan.

1999-08-14  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* manual/install.texi (Configuring and compiling): Mention
	CFLAGS.

1999-08-15  Ulrich Drepper  <drepper@cygnus.com>

	* po/pt_BR.po: New file.

1999-08-13  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* math/libm-test.c (yn_test): Adjust deltas for i386.
	(ccosh_test): Likewise.
	(jn_test): Likewise.

1999-08-15  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/generic/_G_config.h: Get definition of mbstate_t.
Diffstat (limited to 'stdio-common/vfprintf.c')
-rw-r--r--stdio-common/vfprintf.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index 742213282f..a3aa252cd1 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -1115,9 +1115,10 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
 	    assert (__mbsinit (&mbstate));				      \
 	    s2 = (const wchar_t *) string;				      \
 	    string = alloca (len + 1);					      \
-	    (void) __wcsrtombs (string, &s2, len + 1, &mbstate);	      \
 	    if (prec > 0 && prec < len)					      \
-	      len = prec;						      \
+	      len = __wcsrtombs (string, &s2, prec, &mbstate);		      \
+	    else							      \
+	      (void) __wcsrtombs (string, &s2, len + 1, &mbstate);	      \
 	  }								      \
 									      \
 	if ((width -= len) < 0)						      \