about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-07-23 17:40:46 +0000
committerUlrich Drepper <drepper@redhat.com>2000-07-23 17:40:46 +0000
commit6a1fc4ed179502fc1da5b297cd4268333f6595fb (patch)
tree423cd633296872f905e197e16c72592689efe49f
parent3accf5d13d44445693042ffded8ca8f813aa924d (diff)
downloadglibc-6a1fc4ed179502fc1da5b297cd4268333f6595fb.tar.gz
glibc-6a1fc4ed179502fc1da5b297cd4268333f6595fb.tar.xz
glibc-6a1fc4ed179502fc1da5b297cd4268333f6595fb.zip
Update.
	* stdio-common/vfprintf.c (process_string_arg): For wide character
	version, handle precision also correctly.
-rw-r--r--ChangeLog3
-rw-r--r--stdio-common/vfprintf.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c41b19f41..c11ba1fe98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-07-23  Ulrich Drepper  <drepper@redhat.com>
 
+	* stdio-common/vfprintf.c (process_string_arg): For wide character
+	version, handle precision also correctly.
+
 	* nss/nss_files/files-hosts.c: Correct problem with three or more
 	entries with the same name.
 
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index 1682b0b6ce..2a077b480a 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -1037,7 +1037,7 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
 	    string = (CHAR_T *) alloca (len * sizeof (wchar_t));	      \
 									      \
 	    memset (&mbstate, '\0', sizeof (mbstate_t));		      \
-	    len = __mbsrtowcs (string, &mbs, len, &mbstate);		      \
+	    len = __mbsnrtowcs (string, &mbs, len, len, &mbstate);	      \
 	    if (len == (size_t) -1)					      \
 	      {								      \
 		/* Illegal multibyte character.  */			      \