ckolivas/lrzip
1
0
Fork 0
mirror of https://github.com/ckolivas/lrzip.git synced 2025-12-06 07:12:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #131 from pete4abw/infofix

Browse source 
Fix lrzip info display when last chunk has no compression
This commit is contained in:
Con Kolivas 2019-11-04 08:31:09 +11:00 committed by GitHub
parent b922018128 785562a753
commit 02a7bdc6c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lrzip.c
View file

@ -950,6 +950,7 @@ bool get_fileinfo(rzip_control *control)
char chunk_byte = 0; char chunk_byte = 0;
long double cratio; long double cratio;
uchar ctype = 0; uchar ctype = 0;
uchar save_ctype = 255;
struct stat st; struct stat st;
int fd_in; int fd_in;
@ -1080,6 +1081,11 @@ next_chunk:
print_verbose("zpaq"); print_verbose("zpaq");
else else
print_verbose("Dunno wtf"); print_verbose("Dunno wtf");
if (save_ctype == 255)
save_ctype = ctype; /* need this for lzma when some chunks could have no compression
* and info will show rzip + none on info display if last chunk
* is not compressed. Adjust for all types in case it's used in
* the future */
utotal += u_len; utotal += u_len;
ctotal += c_len; ctotal += c_len;
print_verbose("\t%.1f%%\t%lld / %lld", percentage(c_len, u_len), c_len, u_len); print_verbose("\t%.1f%%\t%lld / %lld", percentage(c_len, u_len), c_len, u_len);
@ -1133,17 +1139,17 @@ done:
print_output("%s:\nlrzip version: %d.%d file\n", infilecopy, control->major_version, control->minor_version); print_output("%s:\nlrzip version: %d.%d file\n", infilecopy, control->major_version, control->minor_version);
print_output("Compression: "); print_output("Compression: ");
if (ctype == CTYPE_NONE) if (save_ctype == CTYPE_NONE)
print_output("rzip alone\n"); print_output("rzip alone\n");
else if (ctype == CTYPE_BZIP2) else if (save_ctype == CTYPE_BZIP2)
print_output("rzip + bzip2\n"); print_output("rzip + bzip2\n");
else if (ctype == CTYPE_LZO) else if (save_ctype == CTYPE_LZO)
print_output("rzip + lzo\n"); print_output("rzip + lzo\n");
else if (ctype == CTYPE_LZMA) else if (save_ctype == CTYPE_LZMA)
print_output("rzip + lzma\n"); print_output("rzip + lzma\n");
else if (ctype == CTYPE_GZIP) else if (save_ctype == CTYPE_GZIP)
print_output("rzip + gzip\n"); print_output("rzip + gzip\n");
else if (ctype == CTYPE_ZPAQ) else if (save_ctype == CTYPE_ZPAQ)
print_output("rzip + zpaq\n"); print_output("rzip + zpaq\n");
else else
print_output("Dunno wtf\n"); print_output("Dunno wtf\n");