From 70c87cbc6296f5620012c0f854874540f6b715bf Mon Sep 17 00:00:00 2001 From: Peter Hyman Date: Wed, 31 Dec 2014 13:57:37 -0500 Subject: [PATCH 1/2] Fix for lrzip -i. Decompressed size wrong --- ChangeLog | 5 +++++ WHATS-NEW | 4 ++++ configure.ac | 2 +- lrzip.c | 2 -- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 952edd6..24ba0ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ lrzip ChangeLog +DECEMBER 2014, version 0.617 Peter Hyman + +* Fix display of lrzip -i output so that source filesize is reported +properly when larger than one chunk. + SEPTEMBER 2013, version 0.616 George Makrydakis * Making things more homogeneous in checks, some space removed. diff --git a/WHATS-NEW b/WHATS-NEW index f36741d..5feeada 100644 --- a/WHATS-NEW +++ b/WHATS-NEW @@ -1,3 +1,7 @@ +lrzip-0.617 + +Fixes display output of lrzip -i for large files greater than one chunk. + lrzip-0.616 Fixes for various issues with -O not working with trailing slashes and diff --git a/configure.ac b/configure.ac index 5280a27..485eec4 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [0]) m4_define([v_min], [6]) -m4_define([v_mic], [16]) +m4_define([v_mic], [17]) ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_v], m4_join([], v_min, v_mic)) m4_define([v_ver], [v_maj.v_v]) diff --git a/lrzip.c b/lrzip.c index 3e03a6e..6fb7e94 100644 --- a/lrzip.c +++ b/lrzip.c @@ -1034,8 +1034,6 @@ next_chunk: done: if (unlikely(ofs > infile_size)) failure_goto(("Offset greater than archive size, likely corrupted/truncated archive.\n"), error); - if (chunk_total > expected_size) - expected_size = chunk_total; print_verbose("Rzip compression: %.1f%% %lld / %lld\n", percentage (utotal, expected_size), utotal, expected_size); From 9b7405e9cda0dddb0baab2897148f4b940621386 Mon Sep 17 00:00:00 2001 From: Con Kolivas Date: Mon, 9 Feb 2015 09:03:37 +1100 Subject: [PATCH 2/2] Roll back inappropriately updated version with other patches --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 485eec4..5280a27 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [0]) m4_define([v_min], [6]) -m4_define([v_mic], [17]) +m4_define([v_mic], [16]) ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_v], m4_join([], v_min, v_mic)) m4_define([v_ver], [v_maj.v_v])