Import Debian changes 1.9-2.1

[debian/gzip] / zcat.in

diff --git a/zcat.in b/zcat.in
index 5b3dba16d8c1f9ef26e973c918dd328e0b7a4f0e..77c55cfd2de8e29bc15a37182db2819f2dfdd5a3 100644 (file)
--- a/zcat.in
+++ b/zcat.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Uncompress files to standard output.
 
 #!/bin/sh
 # Uncompress files to standard output.
 

-# Copyright (C) 2007 Free Software Foundation
+# Copyright (C) 2007, 2010-2018 Free Software Foundation, Inc.

 
 # 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
 
 # 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


@@ -17,16 +17,10 @@
 # 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
-

 version="zcat (gzip) @VERSION@
 version="zcat (gzip) @VERSION@

-Copyright (C) 2007, 2009-2010 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 Paul Eggert."
 There is NO WARRANTY, to the extent permitted by law.
 
 Written by Paul Eggert."


@@ -39,6 +33,7 @@ Uncompress FILEs to standard output.
   -q, --quiet       suppress all warnings
   -r, --recursive   operate recursively on directories
   -S, --suffix=SUF  use suffix SUF on compressed files
   -q, --quiet       suppress all warnings
   -r, --recursive   operate recursively on directories
   -S, --suffix=SUF  use suffix SUF on compressed files

+      --synchronous synchronous output (safer if system crashes, but slower)

   -t, --test        test compressed file integrity
   -v, --verbose     verbose mode
       --help        display this help and exit
   -t, --test        test compressed file integrity
   -v, --verbose     verbose mode
       --help        display this help and exit


@@ -49,8 +44,8 @@ With no FILE, or when FILE is -, read standard input.
 Report bugs to <bug-gzip@gnu.org>."
 
 case $1 in
 Report bugs to <bug-gzip@gnu.org>."
 
 case $1 in

---help)    exec echo "$usage";;
---version) exec echo "$version";;
+--help)    printf '%s\n' "$usage"   || exit 1; exit;;
+--version) printf '%s\n' "$version" || exit 1; exit;;

 esac
 
 exec gzip -cd "$@"
 esac
 
 exec gzip -cd "$@"