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

Use even more hackish way to support thousand separators. 

Seems that in addition on Windows and DOS, also OpenBSD
lacks support for %'d style printf() format strings.
So far that is the only modern POSIX-like system I know
with this problem, but after this hack, the thousand
separator shouldn't be a problem on any system.

Maybe testing if a format string like %'d produces
reasonable output is invoking undefined behavior on some
systems, but so far all the problematic systems I've tried
just print the raw format string (e.g. %'d prints 'd).

Maybe Autoconf test would have been better, but this
hack works also for cross-compilation, and avoids
recompilation in case the system libc starts to support
the thousand separator.
This commit is contained in:
Lasse Collin 2009-08-29 14:43:52 +03:00
parent 3432e9c6aa
commit 94c66b3297
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/xz/util.c
View File

@ -13,15 +13,6 @@
#include "private.h" #include "private.h"
// Thousand separator for format strings is not supported outside POSIX.
// This is used in uint64_to_str() and double_to_str().
#ifdef DOSLIKE
# define THOUSAND ""
#else
# define THOUSAND "'"
#endif
extern void * extern void *
xrealloc(void *ptr, size_t size) xrealloc(void *ptr, size_t size)
{ {
@ -135,7 +126,19 @@ uint64_to_str(uint64_t value, uint32_t slot)
assert(slot < ARRAY_SIZE(bufs)); assert(slot < ARRAY_SIZE(bufs));
snprintf(bufs[slot], sizeof(bufs[slot]), "%" THOUSAND PRIu64, value); static enum { UNKNOWN, WORKS, BROKEN } thousand = UNKNOWN;
if (thousand == UNKNOWN) {
bufs[slot][0] = '\0';
snprintf(bufs[slot], sizeof(bufs[slot]), "%'" PRIu64,
UINT64_C(1));
thousand = bufs[slot][0] == '1' ? WORKS : BROKEN;
}
if (thousand == WORKS)
snprintf(bufs[slot], sizeof(bufs[slot]), "%'" PRIu64, value);
else
snprintf(bufs[slot], sizeof(bufs[slot]), "%" PRIu64, value);
return bufs[slot]; return bufs[slot];
} }
@ -147,7 +150,18 @@ double_to_str(double value)
// fields anyway. // fields anyway.
static char buf[64]; static char buf[64];
snprintf(buf, sizeof(buf), "%" THOUSAND ".1f", value); static enum { UNKNOWN, WORKS, BROKEN } thousand = UNKNOWN;
if (thousand == UNKNOWN) {
buf[0] = '\0';
snprintf(buf, sizeof(buf), "%'.1f", 2.0);
thousand = buf[0] == '2' ? WORKS : BROKEN;
}
if (thousand == WORKS)
snprintf(buf, sizeof(buf), "%'.1f", value);
else
snprintf(buf, sizeof(buf), "%.1f", value);
return buf; return buf;
} }