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

diff --git a/zmore.in b/zmore.in
index de6d3db..69bf8b7 100755
--- a/zmore.in
+++ b/zmore.in
@@ -1,7 +1,7 @@
 :
 #!/bin/sh
 
-# Copyright (C) 2001 Free Software Foundation
+# Copyright (C) 2001, 2002 Free Software Foundation
 # Copyright (C) 1992, 1993 Jean-loup Gailly
 
 # This program is free software; you can redistribute it and/or modify
@@ -33,17 +33,17 @@ 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
-   trap 'stty $oldtty 2>/dev/null; exit' 0 2 3 5 10 13 15
+if test $? -eq 0 && test -n "$oldtty"; then
+   trap 'stty $oldtty 2>/dev/null; exit' INT QUIT TRAP USR1 PIPE TERM
 else
-   trap 'stty $ncb echo 2>/dev/null; exit' 0 2 3 5 10 13 15
+   trap 'stty $ncb echo 2>/dev/null; exit' INT QUIT TRAP USR1 PIPE TERM
 fi
 
 if test $# = 0; then
     if test -t 0; then
-	echo usage: zmore files...
+	echo usage: ${ZMORE_PROGRAM_NAME-zmore} files...
     else
-	gzip -cdfq | eval ${PAGER-more}
+	gzip -cdfq | eval more
     fi
 else
     FIRST=1
@@ -56,15 +56,15 @@ else
 		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