Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/procps/ps.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/procps/ps.c (modified) (17 diffs)

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

@@ -63 +63 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #ifdef __linux__
 # include <sys/sysinfo.h>
@@ -71 +72 @@
 
 #if ENABLE_FEATURE_PS_TIME || ENABLE_FEATURE_PS_LONG
-static long get_uptime(void)
+static unsigned long get_uptime(void)
 {
 #ifdef __linux__
@@ -79 +80 @@
     return info.uptime;
 #elif 1
-    char buf[64];
-    long uptime;
+    unsigned long uptime;
+    char buf[sizeof(uptime)*3 + 2];
+    /* /proc/uptime is "UPTIME_SEC.NN IDLE_SEC.NN\n"
+     * (where IDLE is cumulative over all CPUs)
+     */
     if (open_read_close("/proc/uptime", buf, sizeof(buf)) <= 0)
-        bb_perror_msg_and_die("can't read %s", "/proc/uptime");
+        bb_perror_msg_and_die("can't read '%s'", "/proc/uptime");
     buf[sizeof(buf)-1] = '\0';
-    sscanf(buf, "%l", &uptime);
+    sscanf(buf, "%lu", &uptime);
     return uptime;
 #else
@@ -139 +143 @@
 #if ENABLE_FEATURE_PS_TIME
     unsigned kernel_HZ;
-    unsigned long long seconds_since_boot;
+    unsigned long seconds_since_boot;
 #endif
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define out                (G.out               )
 #define out_cnt            (G.out_cnt           )
@@ -150 +154 @@
 #define terminal_width     (G.terminal_width    )
 #define kernel_HZ          (G.kernel_HZ         )
-#define seconds_since_boot (G.seconds_since_boot)
-#define INIT_G() do { } while (0)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 #if ENABLE_FEATURE_PS_TIME
 /* for ELF executables, notes are pushed before environment and args */
-static ptrdiff_t find_elf_note(ptrdiff_t findme)
-{
-    ptrdiff_t *ep = (ptrdiff_t *) environ;
+static uintptr_t find_elf_note(uintptr_t findme)
+{
+    uintptr_t *ep = (uintptr_t *) environ;
 
     while (*ep++)
@@ -223 +226 @@
 static unsigned get_kernel_HZ(void)
 {
-
     if (kernel_HZ)
         return kernel_HZ;
@@ -232 +234 @@
         kernel_HZ = get_HZ_by_waiting();
 
-    seconds_since_boot = get_uptime();
+    G.seconds_since_boot = get_uptime();
 
     return kernel_HZ;
@@ -299 +301 @@
 
     /* see http://en.wikipedia.org/wiki/Tera */
-    smart_ulltoa4(u, buf4, " mgtpezy");
-    buf4[4] = '\0';
+    smart_ulltoa4(u, buf4, " mgtpezy")[0] = '\0';
     sprintf(buf, "%.*s", size, buf4);
 }
@@ -351 +352 @@
     mm = ps->start_time / get_kernel_HZ();
     /* must be after get_kernel_HZ()! */
-    mm = seconds_since_boot - mm;
+    mm = G.seconds_since_boot - mm;
     ss = mm % 60;
     mm /= 60;
@@ -589 +590 @@
     //     Select which columns to display
     /* We allow (and ignore) most of the above. FIXME.
-     * -T is picked for threads (POSIX hasn't it standardized).
+     * -T is picked for threads (POSIX hasn't standardized it).
      * procps v3.2.7 supports -T and shows tids as SPID column,
      * it also supports -L where it shows tids as LWP column.
@@ -600 +601 @@
         } while (opt_o);
     } else {
-        /* Below: parse_o() needs char*, NOT const char*, can't give it default_o */
+        /* Below: parse_o() needs char*, NOT const char*,
+         * can't pass it constant string. Need to make a copy first.
+         */
 #if ENABLE_SELINUX
         if (!(opt & OPT_Z) || !is_selinux_enabled()) {
@@ -621 +624 @@
     terminal_width = MAX_WIDTH;
     if (isatty(1)) {
-        get_terminal_width_height(0, &terminal_width, NULL);
+        terminal_width = get_terminal_width(0);
         if (--terminal_width > MAX_WIDTH)
             terminal_width = MAX_WIDTH;
@@ -653 +656 @@
     };
 #if ENABLE_FEATURE_PS_LONG
-    time_t now = now;
-    long uptime;
+    time_t now = now; /* for compiler */
+    unsigned long uptime = uptime;
 #endif
     /* If we support any options, parse argv */
@@ -671 +674 @@
         terminal_width = (w_count == 1) ? 132 : MAX_WIDTH;
     } else {
-        get_terminal_width_height(0, &terminal_width, NULL);
+        terminal_width = get_terminal_width(0);
         /* Go one less... */
         if (--terminal_width > MAX_WIDTH)
@@ -738 +741 @@
         {
             char buf6[6];
-            smart_ulltoa5(p->vsz, buf6, " mgtpezy");
-            buf6[5] = '\0';
+            smart_ulltoa5(p->vsz, buf6, " mgtpezy")[0] = '\0';
 #if ENABLE_FEATURE_PS_LONG
             if (opts & OPT_l) {
@@ -750 +752 @@
                 struct tm *tm = localtime(&start);
 
-                smart_ulltoa5(p->rss, bufr, " mgtpezy");
-                bufr[5] = '\0';
+                smart_ulltoa5(p->rss, bufr, " mgtpezy")[0] = '\0';
 
                 if (p->tty_major == 136)
@@ -787 +788 @@
         {
             int sz = terminal_width - len;
-            char buf[sz + 1];
-            read_cmdline(buf, sz, p->pid, p->comm);
-            puts(buf);
+            if (sz >= 0) {
+                char buf[sz + 1];
+                read_cmdline(buf, sz, p->pid, p->comm);
+                puts(buf);
+            }
         }
     }