X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=zmore.in;h=33f6798e9c8de1b220f393aa99755e1cee570e7d;hb=e69450077be2e9b4045c21e2ec528e5085ba4820;hp=de6d3db129e6eea8a4242222227d9b99f2fee769;hpb=302189d124ed5849c2589ea92e912eb24fdc4ab3;p=gzip

diff --git a/zmore.in b/zmore.in
old mode 100755
new mode 100644
index de6d3db..33f6798
--- a/zmore.in
+++ b/zmore.in
@@ -1,25 +1,37 @@
-:
 #!/bin/sh
 
-# Copyright (C) 2001 Free Software Foundation
+# Copyright (C) 2001, 2002, 2007 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, 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) 2007 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: $0 [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'
@@ -33,7 +45,7 @@ else
   # 'stty min 1' resets eof to ^a on both SunOS and SysV!
   cb='min 1 -icanon'; ncb='icanon eof ^d'
 fi
-if test $? -eq 0 -a -n "$oldtty"; then
+if test $? -eq 0 && test -n "$oldtty"; then
    trap 'stty $oldtty 2>/dev/null; exit' 0 2 3 5 10 13 15
 else
    trap 'stty $ncb echo 2>/dev/null; exit' 0 2 3 5 10 13 15
@@ -41,30 +53,35 @@ fi
 
 if test $# = 0; then
     if test -t 0; then
-	echo usage: zmore files...
+	echo "$usage"
     else
-	gzip -cdfq | eval ${PAGER-more}
+	gzip -cdfq | eval more
     fi
 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 " "
-		if test "$ANS" = 'e' -o "$ANS" = 'q'; then
-			exit
-		fi
+		case "$ANS" in
+		[eq]) exit;;
+		esac
 	fi
 	if test "$ANS" != 's'; then
 		echo "------> $FILE <------"
-		gzip -cdfq "$FILE" | eval ${PAGER-more}
+		gzip -cdfq -- "$FILE" | more
 	fi
-	if test -t; then
+	if test -t 1; then
 		FIRST=0
 	fi
     done