Date: Wed, 25 Apr 2018 20:52:18 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r333011 - head/usr.bin/grep Message-ID: <201804252052.w3PKqIDl073069@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804252052.w3PKqIDl073069>