X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=zdiff.in;fp=zdiff.in;h=5ac8890c4f93508dfeace43a1cb10772ef963d5c;hb=dc84183747ce1703eb99685b5dbde1f65a143c06;hp=9d3b4aed0a1bd842b84a1b7e71ba2fa987d367af;hpb=a2016c1de6e4884f6c8ed5cc498f3bf821c25ca4;p=debian%2Fgzip diff --git a/zdiff.in b/zdiff.in index 9d3b4ae..5ac8890 100644 --- a/zdiff.in +++ b/zdiff.in @@ -26,12 +26,12 @@ PATH=$bindir:$PATH case $1 in --__cmp) shift - prog=cmp; cmp='${CMP-cmp}' ;; + prog=cmp; cmp='${CMP-cmp}' ;; *) prog=diff; cmp='${DIFF-diff}';; esac version="z$prog (gzip) @VERSION@ -Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc. +Copyright (C) 2009, 2011-2012 Free Software Foundation, Inc. This is free software. You may redistribute copies of it under the terms of the GNU General Public License . There is NO WARRANTY, to the extent permitted by law. @@ -88,78 +88,78 @@ if test $# -eq 1; then exit 2;; esac elif test $# -eq 2; then - case "$1" in - *[-.]gz* | *[-.][zZ] | *.t[ga]z | -) + case "$1" in + *[-.]gz* | *[-.][zZ] | *.t[ga]z | -) case "$2" in - *[-.]gz* | *[-.][zZ] | *.t[ga]z | -) - if test "$1$2" = --; then - gzip_status=$( - exec 4>&1 - (gzip -cdfq - 4>&-; echo $? >&4) 3>&- | - eval "$cmp" - - >&3 - ) - elif - # Reject Solaris 8's buggy /bin/bash 2.03. - echo X | - (echo X | eval "$cmp" /dev/fd/5 - >/dev/null 2>&1) \ - 5<&0 - then - gzip_status=$( - exec 4>&1 - (gzip -cdfq -- "$1" 4>&-; echo $? >&4) 3>&- | - ( (gzip -cdfq -- "$2" 4>&-; echo $? >&4) 3>&- 5<&- &3) 5<&0 - ) - cmp_status=$? - case $gzip_status in - *[1-9]*) gzip_status=1;; - *) gzip_status=0;; - esac - (exit $cmp_status) - else - F=`expr "/$2" : '.*/\(.*\)[-.][zZtga]*$'` || F=$prog - tmp= - trap ' - test -n "$tmp" && rm -f "$tmp" - (exit 2); exit 2 - ' HUP INT PIPE TERM 0 - if type mktemp >/dev/null 2>&1; then - tmp=`mktemp -t -- "$F.XXXXXX"` || exit 2 - else - set -C - tmp=${TMPDIR-/tmp}/$F.$$ - fi - gzip -cdfq -- "$2" > "$tmp" || exit 2 - gzip_status=$( - exec 4>&1 - (gzip -cdfq -- "$1" 4>&-; echo $? >&4) 3>&- | - eval "$cmp" - '"$tmp"' >&3 - ) + *[-.]gz* | *[-.][zZ] | *.t[ga]z | -) + if test "$1$2" = --; then + gzip_status=$( + exec 4>&1 + (gzip -cdfq - 4>&-; echo $? >&4) 3>&- | + eval "$cmp" - - >&3 + ) + elif + # Reject Solaris 8's buggy /bin/bash 2.03. + echo X | + (echo X | eval "$cmp" /dev/fd/5 - >/dev/null 2>&1) \ + 5<&0 + then + gzip_status=$( + exec 4>&1 + (gzip -cdfq -- "$1" 4>&-; echo $? >&4) 3>&- | + ( (gzip -cdfq -- "$2" 4>&-; echo $? >&4) 3>&- 5<&- &3) 5<&0 + ) cmp_status=$? - rm -f "$tmp" || gzip_status=$? - trap - HUP INT PIPE TERM 0 - (exit $cmp_status) - fi;; - *) - gzip_status=$( - exec 4>&1 - (gzip -cdfq -- "$1" 4>&-; echo $? >&4) 3>&- | - eval "$cmp" - '"$2"' >&3 - );; + case $gzip_status in + *[1-9]*) gzip_status=1;; + *) gzip_status=0;; + esac + (exit $cmp_status) + else + F=`expr "/$2" : '.*/\(.*\)[-.][zZtga]*$'` || F=$prog + tmp= + trap ' + test -n "$tmp" && rm -f "$tmp" + (exit 2); exit 2 + ' HUP INT PIPE TERM 0 + if type mktemp >/dev/null 2>&1; then + tmp=`mktemp -t -- "$F.XXXXXX"` || exit 2 + else + set -C + tmp=${TMPDIR-/tmp}/$F.$$ + fi + gzip -cdfq -- "$2" > "$tmp" || exit 2 + gzip_status=$( + exec 4>&1 + (gzip -cdfq -- "$1" 4>&-; echo $? >&4) 3>&- | + eval "$cmp" - '"$tmp"' >&3 + ) + cmp_status=$? + rm -f "$tmp" || gzip_status=$? + trap - HUP INT PIPE TERM 0 + (exit $cmp_status) + fi;; + *) + gzip_status=$( + exec 4>&1 + (gzip -cdfq -- "$1" 4>&-; echo $? >&4) 3>&- | + eval "$cmp" - '"$2"' >&3 + );; esac;; *) case "$2" in - *[-.]gz* | *[-.][zZ] | *.t[ga]z | -) - gzip_status=$( - exec 4>&1 - (gzip -cdfq -- "$2" 4>&-; echo $? >&4) 3>&- | - eval "$cmp" '"$1"' - >&3 - );; - *) eval "$cmp" '"$1"' '"$2"';; + *[-.]gz* | *[-.][zZ] | *.t[ga]z | -) + gzip_status=$( + exec 4>&1 + (gzip -cdfq -- "$2" 4>&-; echo $? >&4) 3>&- | + eval "$cmp" '"$1"' - >&3 + );; + *) eval "$cmp" '"$1"' '"$2"';; esac;; - esac + esac else - echo >&2 "$0: invalid number of operands; try \`$0 --help' for help" - exit 2 + echo >&2 "$0: invalid number of operands; try \`$0 --help' for help" + exit 2 fi cmp_status=$?