aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2011-07-31 11:01:47 +0300
committerLasse Collin <lasse.collin@tukaani.org>2011-07-31 11:01:47 +0300
commit1c673e5681720491a74fc4b2992e075f47302c22 (patch)
treefe5b667068731fadd3f803cd014c3c46b9777cf7 /src
parentliblzma: Remove unneeded semicolon. (diff)
downloadxz-1c673e5681720491a74fc4b2992e075f47302c22.tar.xz
Fix exit status of "xzdiff foo.xz bar.xz".
xzdiff was clobbering the exit status from diff in a case statement used to analyze the exit statuses from "xz" when its operands were two compressed files. Save and restore diff's exit status to fix this. The bug is inherited from zdiff in GNU gzip and was fixed there on 2009-10-09. Thanks to Jonathan Nieder for the patch and to Peter Pallinger for reporting the bug.
Diffstat (limited to 'src')
-rw-r--r--src/scripts/xzdiff.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/scripts/xzdiff.in b/src/scripts/xzdiff.in
index 0fa446f6..e6e38429 100644
--- a/src/scripts/xzdiff.in
+++ b/src/scripts/xzdiff.in
@@ -126,10 +126,12 @@ elif test $# -eq 2; then
( ($xz2 -cdfq -- "$2" 4>&-; echo $? >&4) 3>&- 5<&- </dev/null |
eval "$cmp" /dev/fd/5 - >&3) 5<&0
)
+ cmp_status=$?
case $xz_status in
*[1-9]*) xz_status=1;;
*) xz_status=0;;
esac
+ (exit $cmp_status)
else
F=`expr "/$2" : '.*/\(.*\)[-.][ablmotxz2]*$'` || F=$prog
tmp=