root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

xz: Never use thousand separators in DJGPP builds. 

DJGPP 2.05 added support for thousands separators but it's
broken at least under WinXP with Finnish locale that uses
a non-breaking space as the thousands separator. Workaround
by disabling thousands separators for DJGPP builds.
This commit is contained in:
Lasse Collin 2020-03-11 21:15:35 +02:00
parent ceba0d25e8
commit 74a5af180a
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/xz/util.c
View File

@ -142,14 +142,24 @@ round_up_to_mib(uint64_t n)
} }
/// Check if thousand separator is supported. Run-time checking is easiest, /// Check if thousands separator is supported. Run-time checking is easiest
/// because it seems to be sometimes lacking even on POSIXish system. /// because it seems to be sometimes lacking even on a POSIXish system.
/// Note that trying to use thousands separators when snprintf() doesn't
/// support them results in undefined behavior. This just has happened to
/// work well enough in practice.
///
/// DJGPP 2.05 added support for thousands separators but it's broken
/// at least under WinXP with Finnish locale that uses a non-breaking space
/// as the thousands separator. Workaround by disabling thousands separators
/// for DJGPP builds.
static void static void
check_thousand_sep(uint32_t slot) check_thousand_sep(uint32_t slot)
{ {
if (thousand == UNKNOWN) { if (thousand == UNKNOWN) {
bufs[slot][0] = '\0'; bufs[slot][0] = '\0';
#ifndef __DJGPP__
snprintf(bufs[slot], sizeof(bufs[slot]), "%'u", 1U); snprintf(bufs[slot], sizeof(bufs[slot]), "%'u", 1U);
#endif
thousand = bufs[slot][0] == '1' ? WORKS : BROKEN; thousand = bufs[slot][0] == '1' ? WORKS : BROKEN;
} }