Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/procps/pidof.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/procps/pidof.c (modified) (6 diffs)

branches/2.2.9/mindi-busybox/procps/pidof.c

@@ -5 +5 @@
  * 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.
  */
 
@@ -11 +11 @@
 
 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)
+int pidof_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int pidof_main(int argc UNUSED_PARAM, char **argv)
 {
     unsigned first = 1;
     unsigned opt;
 #if ENABLE_FEATURE_PIDOF_OMIT
-    char ppid_str[sizeof(int)*3 + 1];
     llist_t *omits = NULL; /* list of pids to omit */
     opt_complementary = "o::";
@@ -30 +29 @@
     /* do unconditional option parsing */
     opt = getopt32(argv, ""
-            USE_FEATURE_PIDOF_SINGLE ("s")
-            USE_FEATURE_PIDOF_OMIT("o:", &omits));
+            IF_FEATURE_PIDOF_SINGLE ("s")
+            IF_FEATURE_PIDOF_OMIT("o:", &omits));
 
 #if ENABLE_FEATURE_PIDOF_OMIT
@@ -37 +36 @@
     {
         llist_t *omits_p = omits;
-        while (omits_p) {
+        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 (strcmp(omits_p->data, "%PPID") == 0) {
-                sprintf(ppid_str, "%u", (unsigned)getppid());
-                omits_p->data = ppid_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++) {
 #if ENABLE_FEATURE_PIDOF_OMIT
@@ -59 +58 @@
                 llist_t *omits_p = omits;
                 while (omits_p) {
-                    if (xatoul(omits_p->data) == *pl) {
+                    if (xatoul(omits_p->data) == (unsigned long)(*pl)) {
                         goto omitting;
                     }
@@ -75 +74 @@
         }
         free(pidList);
-        optind++;
+        argv++;
     }
-    putchar('\n');
+    if (!first)
+        bb_putchar('\n');
 
 #if ENABLE_FEATURE_PIDOF_OMIT