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

Merge branch 'dbanerje/procps-namespace'

Browse Source 
References:
 procps-ng/procps!41
This commit is contained in:
Craig Small 2018-03-03 18:00:56 +11:00
commit 3fc3a20523
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pgrep.c
View File

@ -129,7 +129,7 @@ static int __attribute__ ((__noreturn__)) usage(int opt)
fputs(_(" -F, --pidfile <file> read PIDs from file\n"), fp); fputs(_(" -F, --pidfile <file> read PIDs from file\n"), fp);
fputs(_(" -L, --logpidfile fail if PID file is not locked\n"), fp); fputs(_(" -L, --logpidfile fail if PID file is not locked\n"), fp);
fputs(_(" --ns <PID> match the processes that belong to the same\n" fputs(_(" --ns <PID> match the processes that belong to the same\n"
" namespace as <pid>\n"), fp); " namespace as <pid> or 0 for all namespaces\n"), fp);
fputs(_(" --nslist <ns,...> list which namespaces will be considered for\n" fputs(_(" --nslist <ns,...> list which namespaces will be considered for\n"
" the --ns option.\n" " the --ns option.\n"
" Available namespaces: ipc, mnt, net, pid, user, uts\n"), fp); " Available namespaces: ipc, mnt, net, pid, user, uts\n"), fp);
@ -861,8 +861,6 @@ static void parse_opts (int argc, char **argv)
* break; */ * break; */
case NS_OPTION: case NS_OPTION:
opt_ns_pid = atoi(optarg); opt_ns_pid = atoi(optarg);
if (opt_ns_pid == 0)
usage ('?');
++criteria_count; ++criteria_count;
break; break;
case NSLIST_OPTION: case NSLIST_OPTION:
@ -916,6 +914,7 @@ int main (int argc, char **argv)
textdomain(PACKAGE); textdomain(PACKAGE);
atexit(close_stdout); atexit(close_stdout);
opt_ns_pid = getpid();
parse_opts (argc, argv); parse_opts (argc, argv);
procs = select_procs (&num); procs = select_procs (&num);