#!/bin/sh
# sh is buggy on RS/6000 AIX 3.2. Replace above line with #!/bin/ksh
-# Zcmp and zdiff are used to invoke the cmp or the diff pro-
-# gram on compressed files. All options specified are passed
-# directly to cmp or diff. If only 1 file is specified, then
-# the files compared are file1 and an uncompressed file1.gz.
-# If two files are specified, then they are uncompressed (if
-# necessary) and fed to cmp or diff. The exit status from cmp
-# or diff is preserved.
-
-PATH="BINDIR:$PATH"; export PATH
-case "$0" in
- *cmp) prog=cmp ; cmp='${CMP-cmp}' ;;
+# Copyright (C) 1998, 2002, 2006, 2007 Free Software Foundation
+# Copyright (C) 1993 Jean-loup Gailly
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+bindir=@bindir@
+case $1 in
+--__bindir) bindir=${2?}; shift; shift;;
+esac
+PATH=$bindir:$PATH
+
+case $1 in
+ --__cmp) shift
+ prog=cmp; cmp='${CMP-cmp}' ;;
*) prog=diff; cmp='${DIFF-diff}';;
esac
-cmp0=$cmp
version="z$prog (gzip) @VERSION@
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2007 Free Software Foundation, Inc.
This is free software. You may redistribute copies of it under the terms of
the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
There is NO WARRANTY, to the extent permitted by law.
Written by Jean-loup Gailly."
-usage="Usage: z$prog [OPTION]... FILE1 [FILE2]
+usage="Usage: $0 [OPTION]... FILE1 [FILE2]
Compare FILE1 to FILE2, using their uncompressed contents if they are
compressed. If FILE2 is omitted, compare FILE1 to the uncompressed
contents of FILE1.gz. Do comparisons like '$prog' does.
Report bugs to <bug-gzip@gnu.org>."
-FILES=
+# sed script to escape all ' for the shell, and then (to handle trailing
+# newlines correctly) turn trailing X on last line into '.
+escape='
+ s/'\''/'\''\\'\'''\''/g
+ $s/X$/'\''/
+'
+
while :; do
case $1 in
- --h*) echo "$usage" || exit 2; exit;;
+ --h*) printf '%s\n' "$usage" || exit 2; exit;;
--v*) echo "$version" || exit 2; exit;;
--) shift; break;;
- -*\'*) echo >&2 "$prog: $1: option contains apostrophe"; exit 2;;
- -?*) cmp="$cmp '$1'"; shift;;
+ -*\'*) cmp="$cmp '"`printf '%sX\n' "$1" | sed "$escape"`;;
+ -?*) cmp="$cmp '$1'";;
*) break;;
esac
+ shift
done
cmp="$cmp --"
test "X$file" = X- || <"$file" || exit 2
done
+gzip_status=0
+exec 3>&1
+
if test $# -eq 1; then
case $1 in
*[-.]gz* | *[-.][zZ] | *.t[ga]z)
FILE=`expr "X$1" : 'X\(.*\)[-.][zZtga]*$'`
- gzip -cd -- "$1" | eval "$cmp" - '"$FILE"';;
+ gzip_status=$(
+ exec 4>&1
+ (gzip -cd -- "$1" 4>&-; echo $? >&4) 3>&- | eval "$cmp" - '"$FILE"' >&3
+ );;
*)
- echo >&2 "$prog: $1: unknown compressed file extension"
+ echo >&2 "$0: $1: unknown compressed file extension"
exit 2;;
esac
elif test $# -eq 2; then
case "$2" in
*[-.]gz* | *[-.][zZ] | *.t[ga]z | -)
if test "$1$2" = --; then
- gzip -cdfq - | eval "$cmp" - -
+ 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 "$cmp0" /dev/fd/3 - >/dev/null 2>&1) \
- 3<&0
+ (echo X | eval "$cmp" /dev/fd/5 - >/dev/null 2>&1) \
+ 5<&0
then
- gzip -cdfq -- "$1" |
- (gzip -cdfq -- "$2" |
- eval "$cmp" /dev/fd/3 -) 3<&0
+ gzip_status=$(
+ exec 4>&1
+ (gzip -cdfq -- "$1" 4>&-; echo $? >&4) 3>&- |
+ ( (gzip -cdfq -- "$2" 4>&-; echo $? >&4) 3>&- 5<&- </dev/null |
+ eval "$cmp" /dev/fd/5 -) 5<&0
+ )
+ case $gzip_status in
+ *[1-9]*) gzip_status=1;;
+ *) gzip_status=0;;
+ esac
else
F=`expr "/$2" : '.*/\(.*\)[-.][zZtga]*$'` || F=$prog
tmp=
(exit 2); exit 2
' HUP INT PIPE TERM 0
if type mktemp >/dev/null 2>&1; then
- tmp=`mktemp -t -- "$F.XXXXXX"` || exit
+ tmp=`mktemp -t -- "$F.XXXXXX"` || exit 2
else
set -C
tmp=${TMPDIR-/tmp}/$F.$$
fi
- gzip -cdfq -- "$2" > "$tmp" || exit
- gzip -cdfq -- "$1" | eval "$cmp" - '"$tmp"'
- STAT="$?"
- rm -f "$tmp" || STAT=2
+ 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 $STAT
+ (exit $cmp_status)
fi;;
- *) gzip -cdfq -- "$1" | eval "$cmp" - '"$2"';;
+ *)
+ 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 -cdfq -- "$2" | eval "$cmp" '"$1"' -;;
+ gzip_status=$(
+ exec 4>&1
+ (gzip -cdfq -- "$2" 4>&-; echo $? >&4) 3>&- |
+ eval "$cmp" '"$1"' - >&3
+ );;
*) eval "$cmp" '"$1"' '"$2"';;
esac;;
esac
else
- echo >&2 "$usage"
+ echo >&2 "$0: invalid number of operands; try \`$0 --help' for help"
exit 2
fi
+
+cmp_status=$?
+test "$gzip_status" -eq 0 || exit 2
+exit $cmp_status
projects / debian / gzip / blobdiff