Module Name: src Committed By: bouyer Date: Mon Dec 9 20:24:21 UTC 2013
Modified Files: src/usr.bin/gzip [netbsd-6]: zmore Log Message: Pullup the following revisions, requested by pettai in ticket #982: usr.bin/gzip/zmore: revision 1.5 fix == compatibility problem To generate a diff of this commit: cvs rdiff -u -r1.3.52.1 -r1.3.52.2 src/usr.bin/gzip/zmore Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.bin/gzip/zmore diff -u src/usr.bin/gzip/zmore:1.3.52.1 src/usr.bin/gzip/zmore:1.3.52.2 --- src/usr.bin/gzip/zmore:1.3.52.1 Thu Dec 5 18:44:26 2013 +++ src/usr.bin/gzip/zmore Mon Dec 9 20:24:21 2013 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $NetBSD: zmore,v 1.3.52.1 2013/12/05 18:44:26 bouyer Exp $ +# $NetBSD: zmore,v 1.3.52.2 2013/12/09 20:24:21 bouyer Exp $ # # $OpenBSD: zmore,v 1.6 2008/08/20 09:22:02 mpf Exp $ # @@ -41,7 +41,7 @@ while test $# -ne 0; do esac done -if [ `basename $0` == "zless" ] ; then +if [ `basename $0` = "zless" ] ; then pager=${PAGER-less} else pager=${PAGER-more} @@ -49,13 +49,13 @@ fi # No files means read from stdin if [ $# -eq 0 ]; then - gzip -cdfq 2>&1 | ${PAGER-more} $flags + gzip -cdfq 2>&1 | $pager $flags exit 0 fi oterm=`stty -g 2>/dev/null` while test $# -ne 0; do - gzip -cdfq "$1" 2>&1 | ${PAGER-more} $flags + gzip -cdfq "$1" 2>&1 | $pager $flags prev="$1" shift if tty -s && test -n "$oterm" -a $# -gt 0; then