upstream-mirrors/gnulib
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/gnulib.git synced 2026-09-01 11:16:02 +00:00
Code Activity

unistdio/ulc-*printf: Fix padding on 32-bit Cygwin (regr. 2026-07-06).

Browse Source 
* lib/vasnprintf.c (VASNPRINTF): In the 32-bit handling of the %s
directive, if DCHAR_IS_TCHAR && !USE_SNPRINTF, pass the correct address
to mbsnlen().
This commit is contained in:
Bruno Haible
2026-08-15 11:13:11 +02:00
parent fe7ce24f08
commit 7f7253ba4a
2 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+7
View File
@@ -1,3 +1,10 @@
2026-08-15 Bruno Haible <bruno@clisp.org>
unistdio/ulc-*printf: Fix padding on 32-bit Cygwin (regr. 2026-07-06).
* lib/vasnprintf.c (VASNPRINTF): In the 32-bit handling of the %s
directive, if DCHAR_IS_TCHAR && !USE_SNPRINTF, pass the correct address
to mbsnlen().
2026-08-14 Bruno Haible <bruno@clisp.org>
Add unit tests and doc for the %Lf large precision issue on Solaris.
lib/vasnprintf.c
+33 -25
View File
@@ -7646,33 +7646,41 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
if (pad_ourselves && has_width)
{
size_t w;
# if ENABLE_UNISTDIO
/* Outside POSIX, it's preferable to compare the width
against the number of _characters_ of the converted
value. */
w = DCHAR_MBSNLEN (result + length, count);
# elif __GLIBC__ >= 2
/* glibc prefers to compare the width against the number
of characters as well, but only for numeric conversion
specifiers. See
<https://sourceware.org/PR28943>
<https://sourceware.org/PR30883>
<https://sourceware.org/PR31542> */
switch (dp->conversion)
{
case 'd': case 'i': case 'u':
case 'f': case 'F': case 'g': case 'G':
w = DCHAR_MBSNLEN (result + length, count);
break;
default:
w = count;
break;
}
{
# if !DCHAR_IS_TCHAR || USE_SNPRINTF
DCHAR_T * const rp = result + length;
# else
/* The width is compared against the number of _bytes_
of the converted value, says POSIX. */
w = count;
DCHAR_T * const rp = tmp;
# endif
# if ENABLE_UNISTDIO
/* Outside POSIX, it's preferable to compare the width
against the number of _characters_ of the converted
value. */
w = DCHAR_MBSNLEN (rp, count);
# elif __GLIBC__ >= 2
/* glibc prefers to compare the width against the
number of characters as well, but only for numeric
conversion specifiers. See
<https://sourceware.org/PR28943>
<https://sourceware.org/PR30883>
<https://sourceware.org/PR31542> */
switch (dp->conversion)
{
case 'd': case 'i': case 'u':
case 'f': case 'F': case 'g': case 'G':
w = DCHAR_MBSNLEN (rp, count);
break;
default:
w = count;
break;
}
# else
/* The width is compared against the number of _bytes_
of the converted value, says POSIX. */
(void) rp;
w = count;
# endif
}
if (w < width)
{
size_t pad = width - w;