git: 061be8f93912 - stable/13 - Fix zgrep --version
Mateusz Piotrowski
0mp at FreeBSD.org
Mon Apr 26 13:39:53 UTC 2021
The branch stable/13 has been updated by 0mp (doc, ports committer):
URL: https://cgit.FreeBSD.org/src/commit/?id=061be8f939129fd5029efe832d1ad3b381edc3b3
commit 061be8f939129fd5029efe832d1ad3b381edc3b3
Author: Mateusz Piotrowski <0mp at FreeBSD.org>
AuthorDate: 2021-04-13 10:12:53 +0000
Commit: Mateusz Piotrowski <0mp at FreeBSD.org>
CommitDate: 2021-04-26 13:39:54 +0000
Fix zgrep --version
"zgrep --version" is expected to print the version information in the
same way as "zgrep -V". However, the case handling the --version flag
is never reached, so "zgrep --version" prints:
zgrep: missing pattern
instead of:
grep (BSD grep, GNU compatible) 2.6.0-FreeBSD
Reviewed by: yuripv
Approved by: yuripv (src)
Differential Revision: https://reviews.freebsd.org/D29813
(cherry picked from commit 16e0391f8e2124eb85af984204548cf841648db5)
---
usr.bin/grep/zgrep.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/usr.bin/grep/zgrep.sh b/usr.bin/grep/zgrep.sh
index 105507f23708..bd0e8847e5f6 100755
--- a/usr.bin/grep/zgrep.sh
+++ b/usr.bin/grep/zgrep.sh
@@ -94,6 +94,9 @@ do
silent=1
shift
;;
+ -V|--version)
+ exec ${grep} -V
+ ;;
--*)
grep_args="${grep_args} $1"
shift
@@ -128,9 +131,6 @@ do
echo "${prg}: the ${1} flag is not currently supported" >&2
exit 1
;;
- -V|--version)
- exec ${grep} -V
- ;;
-*)
grep_args="${grep_args} $1"
shift
More information about the dev-commits-src-branches
mailing list