picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update.

Browse source 
2000-07-22  Ulrich Drepper  <drepper@redhat.com>

	* stdio-common/vfprintf.c (process_string_arg): Correct handling
	of multibyte character strings in %s format with precision.
This commit is contained in:
Ulrich Drepper 2000-07-22 07:02:05 +00:00
parent c056ee48cb
commit 40c014b3dc
2 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2000-07-22 Ulrich Drepper <drepper@redhat.com>
* stdio-common/vfprintf.c (process_string_arg): Correct handling
of multibyte character strings in %s format with precision.
2000-07-21 Ulrich Drepper <drepper@redhat.com>
* locale/programs/ld-collate.c (collate_read): Allow collating

31
stdio-common/vfprintf.c
View file

@ -1142,9 +1142,34 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
else if (!is_long && spec != L_('S')) \
{ \
if (prec != -1) \
/* Search for the end of the string, but don't search past \
the length specified by the precision. */ \
len = __strnlen (string, prec); \
{ \
/* Search for the end of the string, but don't search past \
the length (in bytes) specified by the precision. Also \
don't use incomplete characters. */ \
if (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_MB_CUR_MAX) == 1) \
len = __strnlen (string, prec); \
else \
{ \
/* In case we have a multibyte character set the \
situation is more compilcated. We must not copy \
bytes at the end which form an incomplete character. */\
wchar_t ignore[prec]; \
const char *str2 = string; \
mbstate_t ps; \
\
memset (&ps, '\0', sizeof (ps)); \
if (__mbsnrtowcs (ignore, &str2, prec, prec, &ps) \
== (size_t) -1) \
{ \
done = -1; \
goto all_done; \
} \
if (str2 == NULL) \
len = strlen (string); \
else \
len = str2 - string - (ps.__count); \
} \
} \
else \
len = strlen (string); \
} \