emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

pgrep: warning about 15+ chars name only if zero matches found

Browse Source 
This avoids situations where longer regex which matches short-named proc is used.
Test for pgrep updated.
This commit is contained in:
Jan Rybar 2016-11-22 17:42:54 +01:00
parent 19649938ec
commit 1aacf4af7f
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pgrep.c
View File

@ -651,6 +651,11 @@ static struct el * select_procs (int *num)
} }
closeproc (ptp); closeproc (ptp);
*num = matches; *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; return list;
} }
@ -886,14 +891,7 @@ static void parse_opts (int argc, char **argv)
} }
if (argc - optind == 1) if (argc - optind == 1)
{
opt_pattern = argv[optind]; 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) else if (argc - optind > 1)
xerrx(EXIT_USAGE, _("only one pattern can be provided\n" xerrx(EXIT_USAGE, _("only one pattern can be provided\n"
"Try `%s --help' for more information."), "Try `%s --help' for more information."),

4
testsuite/pgrep.test/pgrep.exp
View File

@ -118,9 +118,9 @@ set test "pgrep does not match substring with exact"
spawn $pgrep -x $testproc_trim spawn $pgrep -x $testproc_trim
expect_blank $test 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 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 # Cleanup
kill_testproc kill_testproc