From a632aa52833e6f47047692a09301b437defef32f Mon Sep 17 00:00:00 2001 From: Alejandro Colomar Date: Sat, 4 Nov 2023 21:53:13 +0100 Subject: bin/grepc: srcfix (Variables for options hold their '-') This is to allow adding options that have arguments that are passed to pcre2grep(1). Signed-off-by: Alejandro Colomar --- bin/grepc | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/bin/grepc b/bin/grepc index 1807c38..f1e105b 100755 --- a/bin/grepc +++ b/bin/grepc @@ -3,10 +3,10 @@ # Defaults: c='no'; -h='H'; +h='-H'; i=''; -l=''; k='no'; +l=''; t='no'; t_e='no'; t_fp='no'; @@ -46,16 +46,16 @@ grepc_parse_cmd() c='yes'; ;; h) - h='h'; + h='-h'; ;; i) - i='i'; + i='-i'; ;; k) k='yes'; ;; l) - l='l'; + l='-l'; k='yes'; ;; t) @@ -232,15 +232,22 @@ grepc_patterns() grepc_search() { local patterns="$(mktemp -u -t grepc.patterns.XXXXXX)"; + local opts=''; grepc_patterns "$identifier" >"$patterns"; + opts="$opts $h"; + opts="$opts $i"; + opts="$opts $l"; + opts="$opts -M"; + opts="$opts -n"; + if test -z "$files"; then - pcre2grep -${h}${i}${l}HMn -f "$patterns"; + pcre2grep $opts -f "$patterns"; else find $files -type f \ | xargs grep -${i}lPI -- "$identifier" \ - | xargs pcre2grep -${h}${i}${l}HMn -f "$patterns"; + | xargs pcre2grep $opts -f "$patterns"; fi; } -- cgit v1.2.3