From 1aacf4af7f199d77fc9386e249eee654f59880db Mon Sep 17 00:00:00 2001 From: Jan Rybar Date: Tue, 22 Nov 2016 17:42:54 +0100 Subject: [PATCH] pgrep: warning about 15+ chars name only if zero matches found This avoids situations where longer regex which matches short-named proc is used. Test for pgrep updated. --- pgrep.c | 12 +++++------- testsuite/pgrep.test/pgrep.exp | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/pgrep.c b/pgrep.c index 6708f87a..c973def6 100644 --- a/pgrep.c +++ b/pgrep.c @@ -651,6 +651,11 @@ static struct el * select_procs (int *num) } closeproc (ptp); *num = matches; + + if ((!matches) && (!opt_full) && (strlen(opt_pattern) > 15)) + xwarnx(_("pattern that searches for process name longer than 15 characters will result in zero matches\n" + "Try `%s -f' option to match against the complete command line."), + program_invocation_short_name); return list; } @@ -886,14 +891,7 @@ static void parse_opts (int argc, char **argv) } if (argc - optind == 1) - { opt_pattern = argv[optind]; - if ((!opt_full) && (strlen(opt_pattern) > 15)) - xwarnx(_("pattern that contains program name longer than 15 characters will result in zero matches\n" - "Try `%s -f' option for thorough search."), - program_invocation_short_name); - } - else if (argc - optind > 1) xerrx(EXIT_USAGE, _("only one pattern can be provided\n" "Try `%s --help' for more information."), diff --git a/testsuite/pgrep.test/pgrep.exp b/testsuite/pgrep.test/pgrep.exp index 493d1a55..66dd4c7d 100644 --- a/testsuite/pgrep.test/pgrep.exp +++ b/testsuite/pgrep.test/pgrep.exp @@ -118,9 +118,9 @@ set test "pgrep does not match substring with exact" spawn $pgrep -x $testproc_trim expect_blank $test -set test "pgrep with long match gives warning" +set test "pgrep with long non-matching pattern gives warning" spawn $pgrep gnome-session-bi -expect_pass "$test" "pattern that contains program name longer than 15 characters will result in zero matches" +expect_pass "$test" "pattern that searches for process name longer than 15 characters will result in zero matches" # Cleanup kill_testproc