Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/libbb/procps.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/libbb/procps.c (modified) (8 diffs)

branches/3.3/mindi-busybox/libbb/procps.c

@@ -206 +206 @@
         // .....
 
-        char *tp = buf, *p;
+        char *tp, *p;
 
 #define SCAN(S, X) \
-        if (strncmp(tp, S, sizeof(S)-1) == 0) {              \
-            tp = skip_whitespace(tp + sizeof(S)-1);      \
+        if ((tp = is_prefixed_with(buf, S)) != NULL) {       \
+            tp = skip_whitespace(tp);                    \
             total->X += currec.X = fast_strtoul_10(&tp); \
             continue;                                    \
@@ -248 +248 @@
             tp = skip_whitespace(skip_fields(tp, 4));
             // filter out /dev/something (something != zero)
-            if (strncmp(tp, "/dev/", 5) != 0 || strcmp(tp, "/dev/zero\n") == 0) {
+            if (!is_prefixed_with(tp, "/dev/") || strcmp(tp, "/dev/zero\n") == 0) {
                 if (currec.smap_mode[1] == 'w') {
                     currec.mapped_rw = currec.smap_size;
@@ -284 +284 @@
 #endif
 
-void BUG_comm_size(void);
 procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
 {
@@ -386 +385 @@
                 continue;*/
             cp[0] = '\0';
-            if (sizeof(sp->comm) < 16)
-                BUG_comm_size();
+            BUILD_BUG_ON(sizeof(sp->comm) < 16);
             comm1 = strchr(buf, '(');
             /*if (comm1)*/
@@ -498 +496 @@
                     char *tp;
 #define SCAN_TWO(str, name, statement) \
-    if (strncmp(buf, str, sizeof(str)-1) == 0) { \
-        tp = skip_whitespace(buf + sizeof(str)-1); \
+    if ((tp = is_prefixed_with(buf, str)) != NULL) { \
+        tp = skip_whitespace(tp); \
         sscanf(tp, "%u", &sp->name); \
         statement; \
@@ -555 +553 @@
             if (flags & PSSCAN_ARGVN) {
                 sp->argv_len = n;
-                sp->argv0 = xmalloc(n + 1);
-                memcpy(sp->argv0, buf, n + 1);
+                sp->argv0 = xmemdup(buf, n + 1);
                 /* sp->argv0[n] = '\0'; - buf has it */
             } else {
@@ -592 +589 @@
             sz--;
         }
+        if (base[0] == '-') /* "-sh" (login shell)? */
+            base++;
 
         /* If comm differs from argv0, prepend "{comm} ".
          * It allows to see thread names set by prctl(PR_SET_NAME).
          */
-        if (base[0] == '-') /* "-sh" (login shell)? */
-            base++;
+        if (!comm)
+            return;
         comm_len = strlen(comm);
         /* Why compare up to comm_len, not COMM_LEN-1?
@@ -615 +614 @@
             buf[col - 1] = '\0';
         }
-
     } else {
-        snprintf(buf, col, "[%s]", comm);
+        snprintf(buf, col, "[%s]", comm ? comm : "?");
     }
 }