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

pgrep: exit with error message instead of usage()

Browse Source 
Printing usage() output at error is too noisy.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2011-12-18 13:39:28 +01:00
parent 003d388922
commit 46d5d44734
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pgrep.c
View File

@ -732,27 +732,29 @@ static void parse_opts (int argc, char **argv)
}
}
if(opt_lock && !opt_pidfile){
warnx(_("-L without -F makes no sense"));
usage(0);
}
if(opt_lock && !opt_pidfile)
errx(EXIT_FAILURE, _("-L without -F makes no sense\n"
"Try `%s --help' for more information."),
program_invocation_short_name);
if(opt_pidfile){
opt_pid = read_pidfile();
if(!opt_pid){
warnx(_("pidfile not valid"));
usage(0);
}
if(!opt_pid)
errx(EXIT_FAILURE, _("pidfile not valid\n"
"Try `%s --help' for more information."),
program_invocation_short_name);
}
if (argc - optind == 1)
opt_pattern = argv[optind];
else if (argc - optind > 1)
usage (0);
else if (criteria_count == 0) {
warnx(_("no matching criteria specified"));
usage (0);
}
errx(EXIT_FAILURE, _("only one pattern can be provided\n"
"Try `%s --help' for more information."),
program_invocation_short_name);
else if (criteria_count == 0)
errx(EXIT_FAILURE, _("no matching criteria specified\n"
"Try `%s --help' for more information."),
program_invocation_short_name);
}