fixed upstream in 1.5

[debian/gzip] / zmore.in

diff --git a/zmore.in b/zmore.in
index 8ed26ae97c78770c93d77cec5d46f09778b0cdf0..593f52c1ac394384dc45adca837b1d1e536fb4a3 100644 (file)
--- a/zmore.in
+++ b/zmore.in
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# Copyright (C) 2001, 2002, 2007 Free Software Foundation
+# Copyright (C) 2001, 2002, 2007, 2010 Free Software Foundation
 # Copyright (C) 1992, 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 2 of the License, or
+# 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,
@@ -17,10 +17,14 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-PATH="BINDIR:$PATH"; export PATH
+bindir=@bindir@
+case $1 in
+--__bindir) bindir=${2?}; shift; shift;;
+esac
+PATH=$bindir:$PATH; export PATH
 
 version="zmore (gzip) @VERSION@
-Copyright (C) 2007 Free Software Foundation, Inc.
+Copyright (C) 2010-2012 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.
@@ -53,36 +57,36 @@ fi
 
 if test $# = 0; then
     if test -t 0; then
-       echo "$usage"
+        echo >&2 "$0: invalid number of operands; try \`$0 --help' for help"
     else
-       gzip -cdfq | eval ${PAGER-more}
+        gzip -cdfq | eval ${PAGER-more}
     fi
 else
     FIRST=1
     for FILE
     do
-       case $FILE in
-       --h*) exec echo "$usage";;
-       --v*) exec echo "$version";;
-       esac
+        case $FILE in
+        --h*) exec echo "$usage";;
+        --v*) exec echo "$version";;
+        esac
 
-       < "$FILE" || continue
-       if test $FIRST -eq 0; then
-               echo $n1 "--More--(Next file: $FILE)$n2"
-               stty $cb -echo 2>/dev/null
-               ANS=`dd bs=1 count=1 2>/dev/null`
-               stty $ncb echo 2>/dev/null
-               echo " "
-               case "$ANS" in
-               [eq]) exit;;
-               esac
-       fi
-       if test "$ANS" != 's'; then
-               echo "------> $FILE <------"
-               gzip -cdfq -- "$FILE" | eval ${PAGER-more}
-       fi
-       if test -t 1; then
-               FIRST=0
-       fi
+        < "$FILE" || continue
+        if test $FIRST -eq 0; then
+                echo $n1 "--More--(Next file: $FILE)$n2"
+                stty $cb -echo 2>/dev/null
+                ANS=`dd bs=1 count=1 2>/dev/null`
+                stty $ncb echo 2>/dev/null
+                echo " "
+                case "$ANS" in
+                [eq]) exit;;
+                esac
+        fi
+        if test "$ANS" != 's'; then
+                echo "------> $FILE <------"
+                gzip -cdfq -- "$FILE" | eval ${PAGER-more}
+        fi
+        if test -t 1; then
+                FIRST=0
+        fi
     done
 fi