]> granicus.if.org Git - procps-ng/commitdiff
Revert "Support running with child namespaces"
authorCraig Small <csmall@enc.com.au>
Tue, 10 Apr 2018 11:14:01 +0000 (21:14 +1000)
committerCraig Small <csmall@enc.com.au>
Tue, 10 Apr 2018 11:14:01 +0000 (21:14 +1000)
This reverts commit dcb6914f11406a13972636b08b7e26fdafe9efc9.

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

pgrep.c

diff --git a/pgrep.c b/pgrep.c
index 46832a6101798c00df1a86a1baa45b9f5157fde4..b18df4a748e36f47133fec31a40f88c9c45a7e43 100644 (file)
--- a/pgrep.c
+++ b/pgrep.c
@@ -129,7 +129,7 @@ static int __attribute__ ((__noreturn__)) usage(int opt)
        fputs(_(" -F, --pidfile <file>      read PIDs from file\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"
-               "                           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"
                "                           the --ns option.\n"
                "                           Available namespaces: ipc, mnt, net, pid, user, uts\n"), fp);
@@ -861,6 +861,8 @@ static void parse_opts (int argc, char **argv)
  *                     break; */
                case NS_OPTION:
                        opt_ns_pid = atoi(optarg);
+                       if (opt_ns_pid == 0)
+                               usage ('?');
                        ++criteria_count;
                        break;
                case NSLIST_OPTION:
@@ -914,7 +916,6 @@ int main (int argc, char **argv)
        textdomain(PACKAGE);
        atexit(close_stdout);
 
-       opt_ns_pid = getpid();
        parse_opts (argc, argv);
 
        procs = select_procs (&num);