pgrep: add warning that pattern exceeeds 15 chars
Add a warning if you specify a command over 15 characters and don't use the -f command. This is a pick of two patches from master: 24fd260 pgrep: Fix off by one error in line check 4a7f9fc pgrep - adds warning that pattern exceeds 15 chars without References: !25
This commit is contained in:
parent
95ed10ff43
commit
34d040a079
7
pgrep.c
7
pgrep.c
@ -830,7 +830,14 @@ 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."),
|
||||||
|
@ -118,6 +118,10 @@ 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"
|
||||||
|
spawn $pgrep gnome-session-bi
|
||||||
|
expect_pass "$test" "pattern that contains program name longer than 15 characters will result in zero matches"
|
||||||
|
|
||||||
|
|
||||||
# Cleanup
|
# Cleanup
|
||||||
kill_testproc
|
kill_testproc
|
||||||
|
Loading…
x
Reference in New Issue
Block a user