tests: unpack-invalid: correct and clean up a test

[debian/gzip] / zdiff.in

diff --git a/zdiff.in b/zdiff.in
index 60905d5e01a58474f8a4760f0b56f5a0d5f42975..e1efc1ed1bc1e87dacdc7ac8f80d6bc9b872f7b5 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-2016 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2002, 2006-2007, 2009-2017 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,12 +18,6 @@
 # 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
         prog=cmp;  cmp='${CMP-cmp}'  ;;
 case $1 in
   --__cmp) shift
         prog=cmp;  cmp='${CMP-cmp}'  ;;


@@ -31,9 +25,9 @@ case $1 in
 esac
 
 version="z$prog (gzip) @VERSION@
 esac
 
 version="z$prog (gzip) @VERSION@

-Copyright (C) 2009, 2011-2015 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."


@@ -117,15 +111,15 @@ elif test $# -eq 2; then
                         esac
                         (exit $cmp_status)
                     else
                         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=
                         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
+                          tmp=`mktemp` || exit 2

                         else
                         else

+                          F=`expr "/$2" : '.*/\(.*\)[-.][zZtga]*$'` || F=$prog

                           set -C
                           tmp=${TMPDIR-/tmp}/$F.$$
                         fi
                           set -C
                           tmp=${TMPDIR-/tmp}/$F.$$
                         fi