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

Revert Support running with child namespace (catch up)

Browse Source 
--------------- Original Master Branch Commit Message:
This reverts commit dcb6914f11.

This commit broke a lot of scripts that were expecting to see all
programs. See #91

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2018-04-11 00:00:00 -05:00 committed by Craig Small
parent ac73415e32
commit 0e5c4373f4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pgrep.c
View File

@ -144,7 +144,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> or 0 for all namespaces\n"), fp); " namespace as <pid>\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);
@ -805,6 +805,8 @@ 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:
@ -859,7 +861,6 @@ 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);