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

[debian/gzip] / gzexe.in

diff --git a/gzexe.in b/gzexe.in
index 05df25f0aa8accadd1d40533bdd848d608cfeeb6..87413a35afd4f361a5da25b8de34e037975bf27c 100644 (file)
--- a/gzexe.in
+++ b/gzexe.in
@@ -13,7 +13,8 @@
 # On Ultrix, /bin/sh is too buggy, change the first line to: #!/bin/sh5
 
 
 # On Ultrix, /bin/sh is too buggy, change the first line to: #!/bin/sh5
 
 

-# Copyright (C) 1998, 2002, 2004, 2006, 2007 Free Software Foundation
+# Copyright (C) 1998, 2002, 2004, 2006-2007, 2010-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


@@ -36,15 +37,16 @@ nl='
 IFS=" $tab$nl"
 
 version='gzexe (gzip) @VERSION@
 IFS=" $tab$nl"
 
 version='gzexe (gzip) @VERSION@

-Copyright (C) 2007, 2011-2014 Free Software Foundation, Inc.
+Copyright (C) 2007, 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.'
 
 usage="Usage: $0 [OPTION] FILE...
 There is NO WARRANTY, to the extent permitted by law.
 
 Written by Jean-loup Gailly.'
 
 usage="Usage: $0 [OPTION] FILE...

-Rename each FILE with a compressed version of itself, renaming FILE to FILE~.
+Replace each executable FILE with a compressed version of itself.
+Make a backup FILE~ of the old version of FILE.

 
   -d             Decompress each FILE instead of compressing it.
       --help     display this help and exit
 
   -d             Decompress each FILE instead of compressing it.
       --help     display this help and exit


@@ -52,13 +54,6 @@ Rename each FILE with a compressed version of itself, renaming FILE to FILE~.
 
 Report bugs to <bug-gzip@gnu.org>."
 
 
 Report bugs to <bug-gzip@gnu.org>."
 

-
-bindir=@bindir@
-case $1 in
---__bindir) bindir=${2?}; shift; shift;;
-esac
-PATH=$bindir:$PATH
-

 decomp=0
 res=0
 while :; do
 decomp=0
 res=0
 while :; do


@@ -125,7 +120,7 @@ for i do
     mktemp_status=$?
   fi
   if test $mktemp_status -eq 0; then
     mktemp_status=$?
   fi
   if test $mktemp_status -eq 0; then

-    tmp=`TMPDIR=$dir mktemp -t gzexeXXXXXX`
+    tmp=`TMPDIR=$dir mktemp`

   else
     tmp=$dir/gzexe$$
   fi && { cp -p "$file" "$tmp" 2>/dev/null || cp "$file" "$tmp"; } || {
   else
     tmp=$dir/gzexe$$
   fi && { cp -p "$file" "$tmp" 2>/dev/null || cp "$file" "$tmp"; } || {


@@ -163,7 +158,7 @@ trap 'res=$?
 ' 0 1 2 3 5 10 13 15
 
 if type mktemp >/dev/null 2>&1; then
 ' 0 1 2 3 5 10 13 15
 
 if type mktemp >/dev/null 2>&1; then

-  gztmpdir=`mktemp -dt`
+  gztmpdir=`mktemp -d`

 else
   gztmpdir=/tmp/gztmp$$; mkdir $gztmpdir
 fi || { (exit 127); exit 127; }
 else
   gztmpdir=/tmp/gztmp$$; mkdir $gztmpdir
 fi || { (exit 127); exit 127; }