projects / debian / gzip / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fix some lintian whining
[debian/gzip] / zdiff.in
diff --git a/zdiff.in b/zdiff.in
index 506a888ef2d78390d9d6e8eec497b63c37d673a5..960bf86131dc6ed6d28dfc16e38dfab8ba680b76 100644 (file)
--- a/zdiff.in
+++ b/zdiff.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # sh is buggy on RS/6000 AIX 3.2. Replace above line with #!/bin/ksh
 
 #!/bin/sh
 # sh is buggy on RS/6000 AIX 3.2. Replace above line with #!/bin/ksh
 
-# Copyright (C) 1998, 2002, 2006, 2007, 2009 Free Software Foundation
+# Copyright (C) 1998, 2002, 2006-2007, 2009-2018 Free Software Foundation, Inc.
 # Copyright (C) 1993 Jean-loup Gailly
 
 # This program is free software; you can redistribute it and/or modify
 # Copyright (C) 1993 Jean-loup Gailly
 
 # This program is free software; you can redistribute it and/or modify
@@ -18,22 +18,16 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 # 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
 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@
   *)    prog=diff; cmp='${DIFF-diff}';;
 esac
 
 version="z$prog (gzip) @VERSION@
-Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
+Copyright (C) 2009, 2011-2017 Free Software Foundation, Inc.
 This is free software.  You may redistribute copies of it under the terms of
 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>.
+the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
 There is NO WARRANTY, to the extent permitted by law.
 
 Written by Jean-loup Gailly."
 There is NO WARRANTY, to the extent permitted by law.
 
 Written by Jean-loup Gailly."
@@ -56,8 +50,8 @@ escape='
 
 while :; do
   case $1 in
 
 while :; do
   case $1 in
-  --h*) printf '%s\n' "$usage" || exit 2; exit;;
-  --v*) echo "$version" || exit 2; exit;;
+  --h*) printf '%s\n' "$usage"   || exit 2; exit;;
+  --v*) printf '%s\n' "$version" || exit 2; exit;;
   --) shift; break;;
   -*\'*) cmp="$cmp '"`printf '%sX\n' "$1" | sed "$escape"`;;
   -?*) cmp="$cmp '$1'";;
   --) shift; break;;
   -*\'*) cmp="$cmp '"`printf '%sX\n' "$1" | sed "$escape"`;;
   -?*) cmp="$cmp '$1'";;
@@ -76,102 +70,96 @@ gzip_status=0
 exec 3>&1
 
 if test $# -eq 1; then
 exec 3>&1
 
 if test $# -eq 1; then
-  type_file=$(file -b --mime-type "$1")
-
-  case $type_file in
-  application/x-gzip | application/x-compress)
+  case $1 in
+  *[-.]gz* | *[-.][zZ] | *.t[ga]z)
     FILE=`expr "X$1" : 'X\(.*\)[-.][zZtga]*$'`
     FILE=`expr "X$1" : 'X\(.*\)[-.][zZtga]*$'`
-    if test "$FILE" == ""; then
-        FILE="$1"
-    fi;
-    
     gzip_status=$(
       exec 4>&1
       (gzip -cd -- "$1" 4>&-; echo $? >&4) 3>&- | eval "$cmp" - '"$FILE"' >&3
     );;
   *)
     gzip_status=$(
       exec 4>&1
       (gzip -cd -- "$1" 4>&-; echo $? >&4) 3>&- | eval "$cmp" - '"$FILE"' >&3
     );;
   *)
-    echo >&2 "$0: $1: unknown compressed file extension"
+    printf >&2 '%s\n' "$0: $1: unknown compressed file extension"
     exit 2;;
   esac
 elif test $# -eq 2; then
     exit 2;;
   esac
 elif test $# -eq 2; then
-       type_file1=$(file -b --mime-type "$1")
-       type_file2=$(file -b --mime-type "$2")
-       
-       case "$type_file1" in
-       application/x-gzip | application/x-compress)
-                case "$type_file2" in
-               application/x-gzip | application/x-compress)
-                   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<&- </dev/null |
-                              eval "$cmp" /dev/fd/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
-                       if test "$F" == ""; then
-                           F="$2"
-                       fi;
-                       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
-                       )
+        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<&- </dev/null |
+                               eval "$cmp" /dev/fd/5 - >&3) 5<&0
+                        )
+                        cmp_status=$?
+                        case $gzip_status in
+                          *[1-9]*) gzip_status=1;;
+                          *) gzip_status=0;;
+                        esac
+                        (exit $cmp_status)
+                    else
+                        tmp=
+                        trap '
+                          test -n "$tmp" && rm -f "$tmp"
+                          (exit 2); exit 2
+                        ' HUP INT PIPE TERM 0
+                        case $TMPDIR in
+                          / | /*/) ;;
+                          /*) TMPDIR=$TMPDIR/;;
+                          *) TMPDIR=/tmp/;;
+                        esac
+                        if type mktemp >/dev/null 2>&1; then
+                          tmp=`mktemp "${TMPDIR}zdiffXXXXXXXXX"` ||
+                            exit 2
+                        else
+                          set -C
+                          tmp=${TMPDIR}zdiff$$
+                        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=$?
                         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
-                   );;
+                        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;;
                 esac;;
-        *)      case "$type_file2" in
-               application/x-gzip | application/x-compress)
-                       gzip_status=$(
-                         exec 4>&1
-                         (gzip -cdfq -- "$2" 4>&-; echo $? >&4) 3>&- |
-                           eval "$cmp" '"$1"' - >&3
-                       );;
-               *)      eval "$cmp" '"$1"' '"$2"';;
+        *)      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"';;
                 esac;;
                 esac;;
-       esac
+        esac
 else
 else
-       echo >&2 "$0: invalid number of operands; try \`$0 --help' for help"
-       exit 2
+        printf >&2 '%s\n' \
+          "$0: invalid number of operands; try \`$0 --help' for help"
+        exit 2
 fi
 
 cmp_status=$?
 fi
 
 cmp_status=$?
Debian packaging of gzip