Re: CVS commit: [netbsd-6] src/usr.bin/gzip

[Christoph Egger <christoph_egger%gmx.de@localhost>]

Am 05.12.13 19:44, schrieb Manuel Bouyer:
> Module Name:  src
> Committed By: bouyer
> Date:         Thu Dec  5 18:44:26 UTC 2013
> 
> Modified Files:
>       src/usr.bin/gzip [netbsd-6]: zmore
> 
> Log Message:
> Pull up following revision(s) (requested by pettai in ticket #982):
>       distrib/sets/lists/base/mi: revision 1.1049
>       distrib/sets/lists/man/mi: revision 1.1449
>       usr.bin/gzip/Makefile: revision 1.17
>       usr.bin/gzip/Makefile: revision 1.18
>       usr.bin/gzip/zmore: revision 1.4
>       usr.bin/gzip/zmore.1: revision 1.4
> Added zless(1) - comes in the lastest version of zmore(1) from OpenBSD
> (OKed by tron@)
> Add zfgrep that fell off from last update
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.3 -r1.3.52.1 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 src/usr.bin/gzip/zmore:1.3.52.1
> --- src/usr.bin/gzip/zmore:1.3        Mon Mar 29 09:59:42 2004
> +++ src/usr.bin/gzip/zmore    Thu Dec  5 18:44:26 2013
> @@ -1,8 +1,8 @@
>  #!/bin/sh -
>  #
> -# $NetBSD: zmore,v 1.3 2004/03/29 09:59:42 wiz Exp $
> +# $NetBSD: zmore,v 1.3.52.1 2013/12/05 18:44:26 bouyer Exp $
>  #
> -# $OpenBSD: zmore,v 1.4 2003/07/29 07:42:45 otto Exp $
> +# $OpenBSD: zmore,v 1.6 2008/08/20 09:22:02 mpf Exp $
>  #
>  # Copyright (c) 2003 Todd C. Miller <Todd.Miller%courtesan.com@localhost>
>  #
> @@ -41,6 +41,12 @@ while test $# -ne 0; do
>       esac
>  done
>  
> +if [ `basename $0` == "zless" ] ; then

The == is bash'ism.

Christoph

> +     pager=${PAGER-less}
> +else
> +     pager=${PAGER-more}
> +fi
> +
>  # No files means read from stdin
>  if [ $# -eq 0 ]; then
>       gzip -cdfq 2>&1 | ${PAGER-more} $flags
>