Bump to version 1.22.1

[platform/upstream/busybox.git] / procps / pidof.c

diff --git a/procps/pidof.c b/procps/pidof.c
index 1d97189..6d7b591 100644 (file)
--- a/procps/pidof.c
+++ b/procps/pidof.c
@@ -4,22 +4,50 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under the GPL version 2, see the file LICENSE in this tarball.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
-#include "busybox.h"
+//usage:#if (ENABLE_FEATURE_PIDOF_SINGLE || ENABLE_FEATURE_PIDOF_OMIT)
+//usage:#define pidof_trivial_usage
+//usage:       "[OPTIONS] [NAME]..."
+//usage:#define USAGE_PIDOF "\n"
+//usage:#else
+//usage:#define pidof_trivial_usage
+//usage:       "[NAME]..."
+//usage:#define USAGE_PIDOF /* none */
+//usage:#endif
+//usage:#define pidof_full_usage "\n\n"
+//usage:       "List PIDs of all processes with names that match NAMEs"
+//usage:       USAGE_PIDOF
+//usage:       IF_FEATURE_PIDOF_SINGLE(
+//usage:     "\n       -s      Show only one PID"
+//usage:       )
+//usage:       IF_FEATURE_PIDOF_OMIT(
+//usage:     "\n       -o PID  Omit given pid"
+//usage:     "\n               Use %PPID to omit pid of pidof's parent"
+//usage:       )
+//usage:
+//usage:#define pidof_example_usage
+//usage:       "$ pidof init\n"
+//usage:       "1\n"
+//usage:       IF_FEATURE_PIDOF_OMIT(
+//usage:       "$ pidof /bin/sh\n20351 5973 5950\n")
+//usage:       IF_FEATURE_PIDOF_OMIT(
+//usage:       "$ pidof /bin/sh -o %PPID\n20351 5950")
+
+#include "libbb.h"
 
 enum {
-       USE_FEATURE_PIDOF_SINGLE(OPTBIT_SINGLE,)
-       USE_FEATURE_PIDOF_OMIT(  OPTBIT_OMIT  ,)
-       OPT_SINGLE = USE_FEATURE_PIDOF_SINGLE((1<<OPTBIT_SINGLE)) + 0,
-       OPT_OMIT   = USE_FEATURE_PIDOF_OMIT(  (1<<OPTBIT_OMIT  )) + 0,
+       IF_FEATURE_PIDOF_SINGLE(OPTBIT_SINGLE,)
+       IF_FEATURE_PIDOF_OMIT(  OPTBIT_OMIT  ,)
+       OPT_SINGLE = IF_FEATURE_PIDOF_SINGLE((1<<OPTBIT_SINGLE)) + 0,
+       OPT_OMIT   = IF_FEATURE_PIDOF_OMIT(  (1<<OPTBIT_OMIT  )) + 0,
 };
 
-int pidof_main(int argc, char **argv)
+int pidof_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int pidof_main(int argc UNUSED_PARAM, char **argv)
 {
        unsigned first = 1;
-       unsigned fail = 1;
        unsigned opt;
 #if ENABLE_FEATURE_PIDOF_OMIT
        llist_t *omits = NULL; /* list of pids to omit */
@@ -27,64 +55,60 @@ int pidof_main(int argc, char **argv)
 #endif
 
        /* do unconditional option parsing */
-       opt = getopt32(argc, argv, ""
-                       USE_FEATURE_PIDOF_SINGLE ("s")
-                       USE_FEATURE_PIDOF_OMIT("o:", &omits));
+       opt = getopt32(argv, ""
+                       IF_FEATURE_PIDOF_SINGLE ("s")
+                       IF_FEATURE_PIDOF_OMIT("o:", &omits));
 
 #if ENABLE_FEATURE_PIDOF_OMIT
        /* fill omit list.  */
        {
-               char getppid_str[sizeof(int)*3 + 1];
-               llist_t * omits_p = omits;
-               while (omits_p) {
+               llist_t *omits_p = omits;
+               while (1) {
+                       omits_p = llist_find_str(omits_p, "%PPID");
+                       if (!omits_p)
+                               break;
                        /* are we asked to exclude the parent's process ID?  */
-                       if (!strncmp(omits_p->data, "%PPID", 5)) {
-                               llist_pop(&omits_p);
-                               snprintf(getppid_str, sizeof(getppid_str), "%u", (unsigned)getppid());
-                               llist_add_to(&omits_p, getppid_str);
-                       }
-                       omits_p = omits_p->link;
+                       omits_p->data = utoa((unsigned)getppid());
                }
        }
 #endif
        /* Looks like everything is set to go.  */
-       while (optind < argc) {
+       argv += optind;
+       while (*argv) {
                pid_t *pidList;
                pid_t *pl;
 
                /* reverse the pidlist like GNU pidof does.  */
-               pidList = pidlist_reverse(find_pid_by_name(argv[optind]));
+               pidList = pidlist_reverse(find_pid_by_name(*argv));
                for (pl = pidList; *pl; pl++) {
-                       SKIP_FEATURE_PIDOF_OMIT(const) unsigned omitted = 0;
 #if ENABLE_FEATURE_PIDOF_OMIT
                        if (opt & OPT_OMIT) {
                                llist_t *omits_p = omits;
                                while (omits_p) {
-                                       if (xatoul(omits_p->data) == *pl) {
-                                               omitted = 1;
-                                               break;
-                                       } else
-                                               omits_p = omits_p->link;
+                                       if (xatoul(omits_p->data) == (unsigned long)(*pl)) {
+                                               goto omitting;
+                                       }
+                                       omits_p = omits_p->link;
                                }
                        }
 #endif
-                       if (!omitted) {
-                               printf(" %u" + first, (unsigned)*pl);
-                               first = 0;
-                       }
-                       fail = (!ENABLE_FEATURE_PIDOF_OMIT && omitted);
-
+                       printf(" %u" + first, (unsigned)*pl);
+                       first = 0;
                        if (ENABLE_FEATURE_PIDOF_SINGLE && (opt & OPT_SINGLE))
                                break;
+#if ENABLE_FEATURE_PIDOF_OMIT
+ omitting: ;
+#endif
                }
                free(pidList);
-               optind++;
+               argv++;
        }
-       putchar('\n');
+       if (!first)
+               bb_putchar('\n');
 
 #if ENABLE_FEATURE_PIDOF_OMIT
        if (ENABLE_FEATURE_CLEAN_UP)
                llist_free(omits, NULL);
 #endif
-       return fail ? EXIT_FAILURE : EXIT_SUCCESS;
+       return first; /* 1 (failure) - no processes found */
 }