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

pgrep: usage error should exit with 2

Browse Source
This commit is contained in:
albert 2007-05-28 00:16:39 +00:00
parent 8e4bf3e115
commit e5b2b8614d
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -2,7 +2,8 @@ procps-3.2.7 --> procps-3.2.8
ps: document SCHED_BATCH and add "see also" for stime ps: document SCHED_BATCH and add "see also" for stime
ps: man page less ambiguous ps: man page less ambiguous
top: normal exit code should be 0 #341272 top: normal exit code should be 0 #341272 #354255
pgrep: usage error should exit with 2 #413383
procps-3.2.6 --> procps-3.2.7 procps-3.2.6 --> procps-3.2.7

13
pgrep.c
View File

@ -70,18 +70,21 @@ static union el *opt_ruid = NULL;
static char *opt_pattern = NULL; static char *opt_pattern = NULL;
static char *opt_pidfile = NULL; static char *opt_pidfile = NULL;
static int usage (int opt) NORETURN; static int usage (int opt) NORETURN;
static int usage (int opt) static int usage (int opt)
{ {
int err = (opt=='?'); /* getopt() uses '?' to mark an error */
FILE *fp = err ? stderr : stdout;
if (i_am_pkill) if (i_am_pkill)
fprintf (stderr, "Usage: pkill [-SIGNAL] [-fvx] "); fprintf (fp, "Usage: pkill [-SIGNAL] [-fvx] ");
else else
fprintf (stderr, "Usage: pgrep [-flvx] [-d DELIM] "); fprintf (fp, "Usage: pgrep [-flvx] [-d DELIM] ");
fprintf (stderr, "[-n|-o] [-P PPIDLIST] [-g PGRPLIST] [-s SIDLIST]\n" fprintf (fp, "[-n|-o] [-P PPIDLIST] [-g PGRPLIST] [-s SIDLIST]\n"
"\t[-u EUIDLIST] [-U UIDLIST] [-G GIDLIST] [-t TERMLIST] " "\t[-u EUIDLIST] [-U UIDLIST] [-G GIDLIST] [-t TERMLIST] "
"[PATTERN]\n"); "[PATTERN]\n");
exit (opt == '?' ? EXIT_SUCCESS : EXIT_USAGE);
exit(err ? EXIT_USAGE : EXIT_SUCCESS);
} }