Imported Debian patch 1.3.9-1

[gzip] / zmore.in

diff --git a/zmore.in b/zmore.in
old mode 100755 (executable)
new mode 100644 (file)
index 69bf8b7..bd6b947
--- a/zmore.in
+++ b/zmore.in
@@ -1,4 +1,3 @@
-:
 #!/bin/sh
 
 # Copyright (C) 2001, 2002 Free Software Foundation
@@ -6,20 +5,33 @@
 
 # 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, or (at your option)
-# any later version.
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# You should have received a copy of the GNU General Public License along
+# 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
+
+version="zmore (gzip) @VERSION@
+Copyright (C) 2006 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.
+
+Written by Jean-loup Gailly."
+
+usage="Usage: zmore [OPTION]... [FILE]...
+Like 'more', but operate on the uncompressed contents of any compressed FILEs.
+
+Report bugs to <bug-gzip@gnu.org>."
+
 if test "`echo -n a`" = "-n a"; then
   # looks like a SysV system:
   n1=''; n2='\c'
@@ -34,14 +46,14 @@ else
   cb='min 1 -icanon'; ncb='icanon eof ^d'
 fi
 if test $? -eq 0 && test -n "$oldtty"; then
-   trap 'stty $oldtty 2>/dev/null; exit' INT QUIT TRAP USR1 PIPE TERM
+   trap 'stty $oldtty 2>/dev/null; exit' 0 2 3 5 10 13 15
 else
-   trap 'stty $ncb echo 2>/dev/null; exit' INT QUIT TRAP USR1 PIPE TERM
+   trap 'stty $ncb echo 2>/dev/null; exit' 0 2 3 5 10 13 15
 fi
 
 if test $# = 0; then
     if test -t 0; then
-       echo usage: ${ZMORE_PROGRAM_NAME-zmore} files...
+       echo "$usage"
     else
        gzip -cdfq | eval more
     fi
@@ -49,11 +61,16 @@ else
     FIRST=1
     for FILE
     do
+       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` 
+               ANS=`dd bs=1 count=1 2>/dev/null`
                stty $ncb echo 2>/dev/null
                echo " "
                case "$ANS" in
@@ -62,7 +79,7 @@ else
        fi
        if test "$ANS" != 's'; then
                echo "------> $FILE <------"
-               gzip -cdfq "$FILE" | more
+               gzip -cdfq -- "$FILE" | more
        fi
        if test -t 1; then
                FIRST=0