From owner-svn-src-head@freebsd.org  Wed Apr 25 20:52:18 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9F950FB00C3;
 Wed, 25 Apr 2018 20:52:18 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 501768693F;
 Wed, 25 Apr 2018 20:52:18 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4A33066C6;
 Wed, 25 Apr 2018 20:52:18 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3PKqIen073070;
 Wed, 25 Apr 2018 20:52:18 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3PKqIDl073069;
 Wed, 25 Apr 2018 20:52:18 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201804252052.w3PKqIDl073069@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 25 Apr 2018 20:52:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r333011 - head/usr.bin/grep
X-SVN-Group: head
X-SVN-Commit-Author: bapt
X-SVN-Commit-Paths: head/usr.bin/grep
X-SVN-Commit-Revision: 333011
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Apr 2018 20:52:18 -0000

Author: bapt
Date: Wed Apr 25 20:52:17 2018
New Revision: 333011
URL: https://svnweb.freebsd.org/changeset/base/333011

Log:
  zgrep: small improvements
  
  * Use slightly more efficient method to determine the name of the program
  called [1]
  * Use nicer form to loop over arguments [1]
  * add special support for --version along with -V previously added by kevans
  
  Reported by:	jilles@ [1]

Modified:
  head/usr.bin/grep/zgrep.sh

Modified: head/usr.bin/grep/zgrep.sh
==============================================================================
--- head/usr.bin/grep/zgrep.sh	Wed Apr 25 19:46:39 2018	(r333010)
+++ head/usr.bin/grep/zgrep.sh	Wed Apr 25 20:52:17 2018	(r333011)
@@ -34,7 +34,7 @@ grep_args=""
 hyphen=0
 silent=0
 
-prg=$(basename $0)
+prg=${0##*/}
 
 # handle being called 'zegrep' or 'zfgrep'
 case ${prg} in
@@ -106,9 +106,8 @@ do
 	    silent=1
 	    shift
 	    ;;
-	-V)
-	    ${grep} -V
-	    exit $?
+	-V|--version)
+	    exec ${grep} -V
 	    ;;
 	-*)
 	    grep_args="${grep_args} $1"
@@ -145,9 +144,8 @@ else
     if [ ${silent} -lt 1 -a $# -gt 1 ]; then
 	grep_args="-H ${grep_args}"
     fi
-    while [ $# -gt 0 ]
-    do
-	${cattool} ${catargs} -- "$1" | ${grep} --label="${1}" ${grep_args} -- "${pattern}" -
+    for file do
+	${cattool} ${catargs} -- "${file}" | ${grep} --label="${file}" ${grep_args} -- "${pattern}" -
 	shift
     done
 fi