From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun, 9 Aug 2009 18:41:20 +0000 (-0500)
Subject: “xzdiff a.xz b.xz” always fails
X-Git-Tag: upstream/5.1.3~470
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e71903fc6101f1c039d702e335b08aad1e1b4100;p=platform%2Fupstream%2Fxz.git

“xzdiff a.xz b.xz” always fails

Attempts to compare two compressed files result in no output and
exit status 2.

Instead of going to standard output, ‘diff’ output is being
captured in the xz_status variable along with the exit status from
the decompression commands.  Later, when this variable is examined
for nonzero status codes, numerals from dates in the ‘diff’ output
make it appear as though decompression failed.

So let the ‘diff’ output leak to standard output with another file
descriptor.  (This trick is used in all similar contexts elsewhere
in xzdiff and in the analogous context in gzip’s zdiff script.)
---

diff --git a/src/scripts/xzdiff.in b/src/scripts/xzdiff.in
index fc1e057..2d6e5da 100644
--- a/src/scripts/xzdiff.in
+++ b/src/scripts/xzdiff.in
@@ -118,7 +118,7 @@ elif test $# -eq 2; then
               exec 4>&1
               ($xz1 -cdfq -- "$1" 4>&-; echo $? >&4) 3>&- |
                 ( ($xz2 -cdfq -- "$2" 4>&-; echo $? >&4) 3>&- 5<&- </dev/null |
-                eval "$cmp" /dev/fd/5 -) 5<&0
+                eval "$cmp" /dev/fd/5 - >&3) 5<&0
             )
             case $xz_status in
               *[1-9]*) xz_status=1;;