Skip to content

Commit

Permalink
Do not use locale for info output
Browse files Browse the repository at this point in the history
Also, remove all thousands separators from printf formats.
  • Loading branch information
ib committed Mar 8, 2022
1 parent 5302941 commit e816f1d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 15 deletions.
24 changes: 12 additions & 12 deletions lrzip.c
Original file line number Diff line number Diff line change
Expand Up @@ -1072,7 +1072,7 @@ bool get_fileinfo(rzip_control *control)
print_verbose("Chunk byte width: %d\n", chunk_byte);
if (chunk_size) {
chunk_total += chunk_size;
print_verbose("Chunk size: %'"PRId64"\n", chunk_size);
print_verbose("Chunk size: %"PRId64"\n", chunk_size);
}
if (unlikely(chunk_byte && (chunk_byte > 8 || chunk_size < 0)))
failure("Invalid chunk data\n");
Expand All @@ -1086,7 +1086,7 @@ bool get_fileinfo(rzip_control *control)
return false;

print_verbose("Stream: %d\n", stream);
print_maxverbose("Offset: %'"PRId64"\n", stream_head[stream] + ofs);
print_maxverbose("Offset: %"PRId64"\n", stream_head[stream] + ofs);
print_verbose("%s\t%s\t%s\t%16s / %14s", "Block","Comp","Percent","Comp Size", "UComp Size");
print_maxverbose("%18s : %14s", "Offset", "Head");
print_verbose("\n");
Expand Down Expand Up @@ -1127,8 +1127,8 @@ bool get_fileinfo(rzip_control *control)
* the future */
utotal += u_len;
ctotal += c_len;
print_verbose("\t%5.1f%%\t%'16"PRId64" / %'14"PRId64"", percentage(c_len, u_len), c_len, u_len);
print_maxverbose("%'18"PRId64" : %'14"PRId64"", head_off, last_head);
print_verbose("\t%5.1f%%\t%16"PRId64" / %14"PRId64"", percentage(c_len, u_len), c_len, u_len);
print_maxverbose("%18"PRId64" : %14"PRId64"", head_off, last_head);
print_verbose("\n");
block++;
} while (last_head);
Expand Down Expand Up @@ -1165,26 +1165,26 @@ bool get_fileinfo(rzip_control *control)
if (unlikely(ofs > infile_size))
failure_goto(("Offset greater than archive size, likely corrupted/truncated archive.\n"), error);
print_output("\nSummary\n=======\n");
print_output("File: %s\nlrzip version: %'d.%'d \n\n", infilecopy,
print_output("File: %s\nlrzip version: %d.%d \n\n", infilecopy,
control->major_version, control->minor_version);

if (!expected_size)
print_output("Due to %s, expected decompression size not available\n", "Compression to STDOUT");
print_verbose(" Stats Percent Compressed / Uncompressed\n -------------------------------------------------------\n");
/* If we can't show expected size, tailor output for it */
if (expected_size) {
print_verbose(" Rzip: %5.1f%%\t%'16"PRId64" / %'14"PRId64"\n",
print_verbose(" Rzip: %5.1f%%\t%16"PRId64" / %14"PRId64"\n",
percentage (utotal, expected_size),
utotal, expected_size);
print_verbose(" Back end: %5.1f%%\t%'16"PRId64" / %'14"PRId64"\n",
print_verbose(" Back end: %5.1f%%\t%16"PRId64" / %14"PRId64"\n",
percentage(ctotal, utotal),
ctotal, utotal);
print_verbose(" Overall: %5.1f%%\t%'16"PRId64" / %'14"PRId64"\n",
print_verbose(" Overall: %5.1f%%\t%16"PRId64" / %14"PRId64"\n",
percentage(ctotal, expected_size),
ctotal, expected_size);
} else {
print_verbose(" Rzip: Unavailable\n");
print_verbose(" Back end: %5.1f%%\t%'16"PRId64" / %'14"PRId64"\n", percentage(ctotal, utotal), ctotal, utotal);
print_verbose(" Back end: %5.1f%%\t%16"PRId64" / %14"PRId64"\n", percentage(ctotal, utotal), ctotal, utotal);
print_verbose(" Overall: Unavailable\n");
}
print_verbose("\n");
Expand All @@ -1209,12 +1209,12 @@ bool get_fileinfo(rzip_control *control)
print_output("\n");

if (expected_size) {
print_output(" Decompressed file size: %'14"PRIu64"\n", expected_size);
print_output(" Compressed file size: %'14"PRIu64"\n", infile_size);
print_output(" Decompressed file size: %14"PRIu64"\n", expected_size);
print_output(" Compressed file size: %14"PRIu64"\n", infile_size);
print_output(" Compression ratio: %14.3Lfx\n", cratio);
} else {
print_output(" Decompressed file size: Unavailable\n");
print_output(" Compressed file size: %'14"PRIu64"\n", infile_size);
print_output(" Compressed file size: %14"PRIu64"\n", infile_size);
print_output(" Compression ratio: Unavailable\n");
}
if (HAS_MD5) {
Expand Down
3 changes: 0 additions & 3 deletions main.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
#include "lrzip_core.h"
#include "util.h"
#include "stream.h"
#include <locale.h>

/* needed for CRC routines */
#include "lzma/C/7zCrc.h"
Expand Down Expand Up @@ -320,8 +319,6 @@ int main(int argc, char *argv[])
char *eptr, *av; /* for environment */
char *endptr = NULL;

setlocale(LC_ALL, ""); /* for printf features */

control = &base_control;

initialise_control(control);
Expand Down

0 comments on commit e816f1d

Please sign in to comment.