Permalink
Browse files

Fix PR 39648:

	pkglocate --help enters a loop of `grep --help`

by checking the argument before passing it to grep.  Please note that
"grep -e" can't be used because of Solaris options, although I hope to
address that in the next commit.
  • Loading branch information...
1 parent 8d84da8 commit ae62cd4b5a1b57ab61293db02ab987be5581953a agc committed Nov 11, 2010
Showing with 12 additions and 1 deletion.
  1. +12 −1 pkglocate
View
13 pkglocate
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: pkglocate,v 1.9 2004/07/04 16:12:10 jschauma Exp $
+# $NetBSD: pkglocate,v 1.10 2010/11/11 19:56:34 agc Exp $
#
#-
# Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -74,7 +74,18 @@ if [ "$verbose" = "yes" ]; then
echo "===> Using $grepname to find matches"
fi
+# do we need to show the help message?
+showhelp=false
+case "$1" in
+--help)
+ showhelp=true
+ ;;
+esac
if [ $# -lt 1 ]; then
+ showhelp=true
+fi
+
+if $showhelp; then
echo "Usage: pkglocate [-i] [-f] [-p] [-v] word"
echo " [-i] ignore case when searching"
echo " [-f] look for a file, rather than a word or phrase"

0 comments on commit ae62cd4

Please sign in to comment.