From ab07b22a4dd31ccb9beef150fd478c1f8ce6bf31 Mon Sep 17 00:00:00 2001 From: Alejandro Colomar Date: Sun, 5 Nov 2023 13:23:29 +0100 Subject: bin/grepc, grepc.1: Rename option -c to -r This leaves -c unused, so we can add -c with the same meaning of grep(1): count. Signed-off-by: Alejandro Colomar --- bin/grepc | 12 ++++++------ share/man/man1/grepc.1 | 9 +++++---- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/bin/grepc b/bin/grepc index b0145ca..c8e49ca 100755 --- a/bin/grepc +++ b/bin/grepc @@ -5,12 +5,12 @@ A=''; B=''; C=''; -c='no'; h='-H'; i=''; k='no'; l=''; n=''; +r='no'; t='no'; t_e='no'; t_fp='no'; @@ -44,7 +44,7 @@ grepc_err() grepc_parse_cmd() { - while getopts "A:B:C:chiklnt:" opt; do + while getopts "A:B:C:hiklnrt:" opt; do case "$opt" in A) A="-A$OPTARG"; @@ -55,9 +55,6 @@ grepc_parse_cmd() C) C="-C$OPTARG"; ;; - c) - c='yes'; - ;; h) h='-h'; ;; @@ -74,6 +71,9 @@ grepc_parse_cmd() n) n='-n'; ;; + r) + r='yes'; + ;; t) case "$OPTARG" in e) @@ -276,7 +276,7 @@ main() grepc_search \ | sed -E -f <(test "$k" = 'no' && echo 's/^[^: ]+:[0-9]+:/\n\n&\n/') \ - | perl -pe "$(test "$c" = 'yes' && echo 's/('"$identifier"')/\033[32m\1\033[0m/' || echo 's///')" \ + | perl -pe "$(test "$r" = 'yes' && echo 's/('"$identifier"')/\033[32m\1\033[0m/' || echo 's///')" \ | if [ -n "$l" ]; then sort \ | uniq; diff --git a/share/man/man1/grepc.1 b/share/man/man1/grepc.1 index 11e3774..7845255 100644 --- a/share/man/man1/grepc.1 +++ b/share/man/man1/grepc.1 @@ -137,10 +137,6 @@ Print .I n lines of context surrounding a match. .TP -.B \-c -Surround the matched strings -with escape sequences to display them in color on the terminal. -.TP .B \-h Suppress the prefixing of file names on output. .TP @@ -163,6 +159,11 @@ Each file is only printed once. Prefix each line of output with the 1-based line number within its input file. .TP +.B \-r +.RI (colo r ) +Surround the matched strings +with escape sequences to display them in color on the terminal. +.TP .BI \-t " type" Restrict the search to a specific .I type -- cgit v1.2.3