Merge commit '066f39956641300c1e5c6bfe6c11a115cea3e2cf' into merge

Conflicts:
	procps/ps.c

12 files changed, 141 insertions, 158 deletions

diff --git a/procps/fuser.c b/procps/fuser.c
index 8d63a7313..05b52abb1 100644
--- a/procps/fuser.c
+++ b/procps/fuser.c
@@ -11,7 +11,6 @@
 //usage:       "[OPTIONS] FILE or PORT/PROTO"
 //usage:#define fuser_full_usage "\n\n"
 //usage:       "Find processes which use FILEs or PORTs\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -m      Find processes which use same fs as FILEs"
 //usage:     "\n        -4,-6   Search only IPv4/IPv6 space"
 //usage:     "\n        -s      Don't display PIDs"
diff --git a/procps/iostat.c b/procps/iostat.c
index cd233c72f..978d23430 100644
--- a/procps/iostat.c
+++ b/procps/iostat.c
@@ -7,23 +7,24 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
-//applet:IF_IOSTAT(APPLET(iostat, BB_DIR_BIN, BB_SUID_DROP))
-
-//kbuild:lib-$(CONFIG_IOSTAT) += iostat.o
-
 //config:config IOSTAT
 //config:       bool "iostat"
 //config:       default y
 //config:       help
 //config:         Report CPU and I/O statistics
 
+//applet:IF_IOSTAT(APPLET(iostat, BB_DIR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_IOSTAT) += iostat.o
+
 #include "libbb.h"
-#include <sys/utsname.h>  /* Need struct utsname */
+#include <sys/utsname.h>  /* struct utsname */
 
 //#define debug(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__)
 #define debug(fmt, ...) ((void)0)
 
 #define MAX_DEVICE_NAME 12
+#define MAX_DEVICE_NAME_STR "12"
 
 #if 1
 typedef unsigned long long cputime_t;
@@ -64,21 +65,27 @@ typedef struct {
         cputime_t itv;
 } stats_cpu_pair_t;
 
-struct stats_dev {
-        char dname[MAX_DEVICE_NAME];
+typedef struct {
         unsigned long long rd_sectors;
         unsigned long long wr_sectors;
         unsigned long rd_ops;
         unsigned long wr_ops;
-};
+} stats_dev_data_t;
+
+typedef struct stats_dev {
+        struct stats_dev *next;
+        char dname[MAX_DEVICE_NAME + 1];
+        stats_dev_data_t prev_data;
+        stats_dev_data_t curr_data;
+} stats_dev_t;
 
 /* Globals. Sort by size and access frequency. */
 struct globals {
         smallint show_all;
         unsigned total_cpus;            /* Number of CPUs */
         unsigned clk_tck;               /* Number of clock ticks per second */
-        llist_t *dev_list;              /* List of devices entered on the command line */
-        struct stats_dev *saved_stats_dev;
+        llist_t *dev_name_list;         /* List of devices entered on the command line */
+        stats_dev_t *stats_dev_list;
         struct tm tmtime;
         struct {
                 const char *str;
@@ -114,7 +121,7 @@ static ALWAYS_INLINE int this_is_smp(void)
 
 static void print_header(void)
 {
-        char buf[16];
+        char buf[32];
         struct utsname uts;
 
         uname(&uts); /* never fails */
@@ -136,7 +143,7 @@ static void get_localtime(struct tm *ptm)
 
 static void print_timestamp(void)
 {
-        char buf[20];
+        char buf[64];
         /* %x: date representation for the current locale */
         /* %X: time representation for the current locale */
         strftime(buf, sizeof(buf), "%x %X", &G.tmtime);
@@ -162,18 +169,22 @@ static cputime_t get_smp_uptime(void)
 static void get_cpu_statistics(stats_cpu_t *sc)
 {
         FILE *fp;
-        char buf[1024], *ibuf = buf + 4;
+        char buf[1024];
 
         fp = xfopen_for_read("/proc/stat");
 
         memset(sc, 0, sizeof(*sc));
 
         while (fgets(buf, sizeof(buf), fp)) {
-                /* Does the line starts with "cpu "? */
+                int i;
+                char *ibuf;
+
+                /* Does the line start with "cpu "? */
                 if (!starts_with_cpu(buf) || buf[3] != ' ') {
                         continue;
                 }
-                for (int i = STATS_CPU_USER; i <= STATS_CPU_GUEST; i++) {
+                ibuf = buf + 4;
+                for (i = STATS_CPU_USER; i <= STATS_CPU_GUEST; i++) {
                         ibuf = skip_whitespace(ibuf);
                         sscanf(ibuf, "%"FMT_DATA"u", &sc->vector[i]);
                         if (i != STATS_CPU_GUEST) {
@@ -233,7 +244,7 @@ static void print_stats_cpu_struct(stats_cpu_pair_t *stats)
 {
         cputime_t *p = stats->prev->vector;
         cputime_t *c = stats->curr->vector;
-        printf("         %6.2f  %6.2f  %6.2f  %6.2f  %6.2f  %6.2f\n",
+        printf("        %7.2f %7.2f %7.2f %7.2f %7.2f %7.2f\n",
                 percent_value(p[STATS_CPU_USER]  , c[STATS_CPU_USER]  , stats->itv),
                 percent_value(p[STATS_CPU_NICE]  , c[STATS_CPU_NICE]  , stats->itv),
                 percent_value(p[STATS_CPU_SYSTEM] + p[STATS_CPU_SOFTIRQ] + p[STATS_CPU_IRQ],
@@ -244,36 +255,40 @@ static void print_stats_cpu_struct(stats_cpu_pair_t *stats)
         );
 }
 
-static void print_stats_dev_struct(const struct stats_dev *p,
-                const struct stats_dev *c, cputime_t itv)
+static void cpu_report(stats_cpu_pair_t *stats)
 {
+        /* Always print a header */
+        puts("avg-cpu:  %user   %nice %system %iowait  %steal   %idle");
+
+        /* Print current statistics */
+        print_stats_cpu_struct(stats);
+}
+
+static void print_stats_dev_struct(stats_dev_t *stats_dev, cputime_t itv)
+{
+        stats_dev_data_t *p = &stats_dev->prev_data;
+        stats_dev_data_t *c = &stats_dev->curr_data;
         if (option_mask32 & OPT_z)
                 if (p->rd_ops == c->rd_ops && p->wr_ops == c->wr_ops)
                         return;
 
-        printf("%-13s %8.2f %12.2f %12.2f %10llu %10llu \n", c->dname,
-                percent_value(p->rd_ops + p->wr_ops ,
-                /**/              c->rd_ops + c->wr_ops , itv),
+        printf("%-13s %8.2f %12.2f %12.2f %10llu %10llu\n",
+                stats_dev->dname,
+                percent_value(p->rd_ops + p->wr_ops, c->rd_ops + c->wr_ops, itv),
                 percent_value(p->rd_sectors, c->rd_sectors, itv) / G.unit.div,
                 percent_value(p->wr_sectors, c->wr_sectors, itv) / G.unit.div,
                 (c->rd_sectors - p->rd_sectors) / G.unit.div,
-                (c->wr_sectors - p->wr_sectors) / G.unit.div);
-}
-
-static void cpu_report(stats_cpu_pair_t *stats)
-{
-        /* Always print a header */
-        puts("avg-cpu:  %user   %nice %system %iowait  %steal   %idle");
-
-        /* Print current statistics */
-        print_stats_cpu_struct(stats);
+                (c->wr_sectors - p->wr_sectors) / G.unit.div
+        );
 }
 
 static void print_devstat_header(void)
 {
-        printf("Device:%15s%6s%s/s%6s%s/s%6s%s%6s%s\n", "tps",
+        printf("Device:%15s%6s%s/s%6s%s/s%6s%s%6s%s\n",
+                "tps",
                 G.unit.str, "_read", G.unit.str, "_wrtn",
-                G.unit.str, "_read", G.unit.str, "_wrtn");
+                G.unit.str, "_read", G.unit.str, "_wrtn"
+        );
 }
 
 /*
@@ -285,61 +300,81 @@ static int is_partition(const char *dev)
         return ((dev[0] - 's') | (dev[1] - 'd') | (dev[2] - 'a')) == 0 && isdigit(dev[3]);
 }
 
+static stats_dev_t *stats_dev_find_or_new(const char *dev_name)
+{
+        stats_dev_t **curr = &G.stats_dev_list;
+
+        while (*curr != NULL) {
+                if (strcmp((*curr)->dname, dev_name) == 0)
+                        return *curr;
+                curr = &(*curr)->next;
+        }
+
+        *curr = xzalloc(sizeof(stats_dev_t));
+        strncpy((*curr)->dname, dev_name, MAX_DEVICE_NAME);
+        return *curr;
+}
+
+static void stats_dev_free(stats_dev_t *stats_dev)
+{
+        if (stats_dev) {
+                stats_dev_free(stats_dev->next);
+                free(stats_dev);
+        }
+}
+
 static void do_disk_statistics(cputime_t itv)
 {
+        char buf[128];
+        char dev_name[MAX_DEVICE_NAME + 1];
+        unsigned long long rd_sec_or_dummy;
+        unsigned long long wr_sec_or_dummy;
+        stats_dev_data_t *curr_data;
+        stats_dev_t *stats_dev;
         FILE *fp;
         int rc;
-        int i = 0;
-        char buf[128];
-        unsigned major, minor;
-        unsigned long wr_ops, dummy; /* %*lu for suppress the conversion wouldn't work */
-        unsigned long long rd_sec_or_wr_ops;
-        unsigned long long rd_sec_or_dummy, wr_sec_or_dummy, wr_sec;
-        struct stats_dev sd;
 
         fp = xfopen_for_read("/proc/diskstats");
-
         /* Read and possibly print stats from /proc/diskstats */
         while (fgets(buf, sizeof(buf), fp)) {
-                rc = sscanf(buf, "%u %u %s %lu %llu %llu %llu %lu %lu %llu %lu %lu %lu %lu",
-                        &major, &minor, sd.dname, &sd.rd_ops,
-                        &rd_sec_or_dummy, &rd_sec_or_wr_ops, &wr_sec_or_dummy,
-                        &wr_ops, &dummy, &wr_sec, &dummy, &dummy, &dummy, &dummy);
-
-                switch (rc) {
-                case 14:
-                        sd.wr_ops = wr_ops;
-                        sd.rd_sectors = rd_sec_or_wr_ops;
-                        sd.wr_sectors = wr_sec;
-                        break;
-                case 7:
-                        sd.rd_sectors = rd_sec_or_dummy;
-                        sd.wr_ops = (unsigned long)rd_sec_or_wr_ops;
-                        sd.wr_sectors = wr_sec_or_dummy;
-                        break;
-                default:
-                        break;
+                sscanf(buf, "%*s %*s %"MAX_DEVICE_NAME_STR"s", dev_name);
+                if (G.dev_name_list) {
+                        /* Is device name in list? */
+                        if (!llist_find_str(G.dev_name_list, dev_name))
+                                continue;
+                } else if (is_partition(dev_name)) {
+                        continue;
                 }
 
-                if (!G.dev_list && !is_partition(sd.dname)) {
-                        /* User didn't specify device */
-                        if (!G.show_all && !sd.rd_ops && !sd.wr_ops) {
-                                /* Don't print unused device */
-                                continue;
-                        }
-                        print_stats_dev_struct(&G.saved_stats_dev[i], &sd, itv);
-                        G.saved_stats_dev[i] = sd;
-                        i++;
-                } else {
-                        /* Is device in device list? */
-                        if (llist_find_str(G.dev_list, sd.dname)) {
-                                /* Print current statistics */
-                                print_stats_dev_struct(&G.saved_stats_dev[i], &sd, itv);
-                                G.saved_stats_dev[i] = sd;
-                                i++;
-                        } else
-                                continue;
+                stats_dev = stats_dev_find_or_new(dev_name);
+                curr_data = &stats_dev->curr_data;
+
+                rc = sscanf(buf, "%*s %*s %*s %lu %llu %llu %llu %lu %*s %llu",
+                        &curr_data->rd_ops,
+                        &rd_sec_or_dummy,
+                        &curr_data->rd_sectors,
+                        &wr_sec_or_dummy,
+                        &curr_data->wr_ops,
+                        &curr_data->wr_sectors);
+                if (rc != 6) {
+                        curr_data->rd_sectors = rd_sec_or_dummy;
+                        curr_data->wr_sectors = wr_sec_or_dummy;
+                        //curr_data->rd_ops = ;
+                        curr_data->wr_ops = (unsigned long)curr_data->rd_sectors;
                 }
+
+                if (!G.dev_name_list /* User didn't specify device */
+                 && !G.show_all
+                 && curr_data->rd_ops == 0
+                 && curr_data->wr_ops == 0
+                ) {
+                        /* Don't print unused device */
+                        continue;
+                }
+
+                /* Print current statistics */
+                print_stats_dev_struct(stats_dev, itv);
+                stats_dev->prev_data = *curr_data;
         }
 
         fclose(fp);
@@ -354,40 +389,10 @@ static void dev_report(cputime_t itv)
         do_disk_statistics(itv);
 }
 
-static unsigned get_number_of_devices(void)
-{
-        FILE *fp;
-        char buf[128];
-        int rv;
-        unsigned n = 0;
-        unsigned long rd_ops, wr_ops;
-        char dname[MAX_DEVICE_NAME];
-
-        fp = xfopen_for_read("/proc/diskstats");
-
-        while (fgets(buf, sizeof(buf), fp)) {
-                rv = sscanf(buf, "%*d %*d %s %lu %*u %*u %*u %lu",
-                                dname, &rd_ops, &wr_ops);
-                if (rv == 2 || is_partition(dname))
-                        /* A partition */
-                        continue;
-                if (!rd_ops && !wr_ops) {
-                        /* Unused device */
-                        if (!G.show_all)
-                                continue;
-                }
-                n++;
-        }
-
-        fclose(fp);
-        return n;
-}
-
 //usage:#define iostat_trivial_usage
 //usage:       "[-c] [-d] [-t] [-z] [-k|-m] [ALL|BLOCKDEV...] [INTERVAL [COUNT]]"
 //usage:#define iostat_full_usage "\n\n"
 //usage:       "Report CPU and I/O statistics\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -c      Show CPU utilization"
 //usage:     "\n        -d      Show device utilization"
 //usage:     "\n        -t      Print current time"
@@ -398,7 +403,7 @@ static unsigned get_number_of_devices(void)
 int iostat_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int iostat_main(int argc UNUSED_PARAM, char **argv)
 {
-        int opt, dev_num;
+        int opt;
         unsigned interval;
         int count;
         stats_cpu_t stats_data[2];
@@ -427,14 +432,12 @@ int iostat_main(int argc UNUSED_PARAM, char **argv)
         argv += optind;
 
         /* Store device names into device list */
-        dev_num = 0;
         while (*argv && !isdigit(*argv[0])) {
                 if (strcmp(*argv, "ALL") != 0) {
                         /* If not ALL, save device name */
                         char *dev_name = skip_dev_pfx(*argv);
-                        if (!llist_find_str(G.dev_list, dev_name)) {
-                                llist_add_to(&G.dev_list, dev_name);
-                                dev_num++;
+                        if (!llist_find_str(G.dev_name_list, dev_name)) {
+                                llist_add_to(&G.dev_name_list, dev_name);
                         }
                 } else {
                         G.show_all = 1;
@@ -454,13 +457,6 @@ int iostat_main(int argc UNUSED_PARAM, char **argv)
                         count = xatoi_positive(*argv);
         }
 
-        /* Allocate space for device stats */
-        if (opt & OPT_d) {
-                G.saved_stats_dev = xzalloc(sizeof(G.saved_stats_dev[0]) *
-                                (dev_num ? dev_num : get_number_of_devices())
-                );
-        }
-
         if (opt & OPT_m) {
                 G.unit.str = " MB";
                 G.unit.div = 2048;
@@ -530,8 +526,8 @@ int iostat_main(int argc UNUSED_PARAM, char **argv)
         }
 
         if (ENABLE_FEATURE_CLEAN_UP) {
-                llist_free(G.dev_list, NULL);
-                free(G.saved_stats_dev);
+                llist_free(G.dev_name_list, NULL);
+                stats_dev_free(G.stats_dev_list);
                 free(&G);
         }
 
diff --git a/procps/kill.c b/procps/kill.c
index fa79ce2e7..8aa0eb3e2 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -12,7 +12,6 @@
 //usage:       "[-l] [-SIG] PID..."
 //usage:#define kill_full_usage "\n\n"
 //usage:       "Send a signal (default: TERM) to given PIDs\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -l      List all signal names and numbers"
 /* //usage:  "\n        -s SIG  Yet another way of specifying SIG" */
 //usage:
@@ -30,7 +29,6 @@
 //usage:       "[-l] [-q] [-SIG] PROCESS_NAME..."
 //usage:#define killall_full_usage "\n\n"
 //usage:       "Send a signal (default: TERM) to given processes\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -l      List all signal names and numbers"
 /* //usage:  "\n        -s SIG  Yet another way of specifying SIG" */
 //usage:     "\n        -q      Don't complain if no processes were killed"
@@ -42,7 +40,6 @@
 //usage:       "[-l] [-SIG] [-o PID]..."
 //usage:#define killall5_full_usage "\n\n"
 //usage:       "Send a signal (default: TERM) to all processes outside current session\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -l      List all signal names and numbers"
 //usage:     "\n        -o PID  Don't signal this PID"
 /* //usage:  "\n        -s SIG  Yet another way of specifying SIG" */
diff --git a/procps/mpstat.c b/procps/mpstat.c
index da8f34dab..aa5a5c73f 100644
--- a/procps/mpstat.c
+++ b/procps/mpstat.c
@@ -844,7 +844,6 @@ static int get_irqcpu_nr(const char *f, int max_irqs)
 //usage:       "[-A] [-I SUM|CPU|ALL|SCPU] [-u] [-P num|ALL] [INTERVAL [COUNT]]"
 //usage:#define mpstat_full_usage "\n\n"
 //usage:       "Per-processor statistics\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -A                      Same as -I ALL -u -P ALL"
 //usage:     "\n        -I SUM|CPU|ALL|SCPU     Report interrupt statistics"
 //usage:     "\n        -P num|ALL              Processor to monitor"
diff --git a/procps/pgrep.c b/procps/pgrep.c
index 902a3a75e..dc7ffff48 100644
--- a/procps/pgrep.c
+++ b/procps/pgrep.c
@@ -11,7 +11,6 @@
 //usage:       "[-flnovx] [-s SID|-P PPID|PATTERN]"
 //usage:#define pgrep_full_usage "\n\n"
 //usage:       "Display process(es) selected by regex PATTERN\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -l      Show command name too"
 //usage:     "\n        -f      Match against entire command line"
 //usage:     "\n        -n      Show the newest process only"
@@ -25,7 +24,6 @@
 //usage:       "[-l|-SIGNAL] [-fnovx] [-s SID|-P PPID|PATTERN]"
 //usage:#define pkill_full_usage "\n\n"
 //usage:       "Send a signal to process(es) selected by regex PATTERN\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -l      List all signals"
 //usage:     "\n        -f      Match against entire command line"
 //usage:     "\n        -n      Signal the newest process only"
@@ -130,7 +128,7 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
                 bb_show_usage();
 
         if (argv[0])
-                xregcomp(&re_buffer, argv[0], 0);
+                xregcomp(&re_buffer, argv[0], REG_EXTENDED | REG_NOSUB);
 
         matched_pid = 0;
         cmd_last = NULL;
diff --git a/procps/pidof.c b/procps/pidof.c
index e102a31c6..6d7b59109 100644
--- a/procps/pidof.c
+++ b/procps/pidof.c
@@ -10,7 +10,7 @@
 //usage:#if (ENABLE_FEATURE_PIDOF_SINGLE || ENABLE_FEATURE_PIDOF_OMIT)
 //usage:#define pidof_trivial_usage
 //usage:       "[OPTIONS] [NAME]..."
-//usage:#define USAGE_PIDOF "\n\nOptions:"
+//usage:#define USAGE_PIDOF "\n"
 //usage:#else
 //usage:#define pidof_trivial_usage
 //usage:       "[NAME]..."
diff --git a/procps/pmap.c b/procps/pmap.c
index 7f7f391b9..fd995a54d 100644
--- a/procps/pmap.c
+++ b/procps/pmap.c
@@ -8,22 +8,22 @@
  * for details.
  */
 
-//applet:IF_PMAP(APPLET(pmap, BB_DIR_USR_BIN, BB_SUID_DROP))
-//kbuild:lib-$(CONFIG_PMAP)     += pmap.o
-
 //config:config PMAP
 //config:       bool "pmap"
 //config:       default y
 //config:       help
 //config:         Display processes' memory mappings.
 
+//applet:IF_PMAP(APPLET(pmap, BB_DIR_USR_BIN, BB_SUID_DROP))
+//kbuild:lib-$(CONFIG_PMAP) += pmap.o
+
 //usage:#define pmap_trivial_usage
-//usage:       "[-x][-q] PID"
+//usage:       "[-xq] PID"
 //usage:#define pmap_full_usage "\n\n"
-//usage:       "Display detailed precesses' memory usage\n"
-//usage:       "\nOptions:"
-//usage:       "\n     -x              show details"
-//usage:       "\n     -q              quiet"
+//usage:       "Display detailed process memory usage"
+//usage:     "\n"
+//usage:     "\n        -x      Show details"
+//usage:     "\n        -q      Quiet"
 
 #include "libbb.h"
 
diff --git a/procps/ps.c b/procps/ps.c
index 41e1b1e87..41124279d 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -15,7 +15,6 @@
 //usage:       "[-o COL1,COL2=HEADER]" IF_FEATURE_SHOW_THREADS(" [-T]")
 //usage:#define ps_full_usage "\n\n"
 //usage:       "Show list of processes\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -o COL1,COL2=HEADER     Select columns for display"
 //usage:        IF_FEATURE_SHOW_THREADS(
 //usage:     "\n        -T                      Show threads"
@@ -26,7 +25,7 @@
 //usage:#if !ENABLE_SELINUX && !ENABLE_FEATURE_PS_WIDE
 //usage:#define USAGE_PS "\nThis version of ps accepts no options"
 //usage:#else
-//usage:#define USAGE_PS "\nOptions:"
+//usage:#define USAGE_PS ""
 //usage:#endif
 //usage:
 //usage:#define ps_trivial_usage
@@ -88,15 +87,6 @@ enum { MAX_WIDTH = 2*1024 };
  * TIME      The cumulative execution time for the process
  * CMD       The command name; the full command line is shown with -f
  */
-#if ENABLE_SELINUX
-# define SELINUX_O_PREFIX "label,"
-# define DEFAULT_O_STR    (SELINUX_O_PREFIX "pid,user" IF_FEATURE_PS_TIME(",time") ",args")
-#elif ENABLE_PLATFORM_MINGW32
-# define DEFAULT_O_STR    ("pid,comm")
-#else
-# define DEFAULT_O_STR    ("pid,user" IF_FEATURE_PS_TIME(",time") ",args")
-#endif
-
 typedef struct {
         uint16_t width;
         char name6[6];
@@ -116,7 +106,6 @@ struct globals {
         unsigned kernel_HZ;
         unsigned long long seconds_since_boot;
 #endif
-        char default_o[sizeof(DEFAULT_O_STR)];
 } FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
 #define out                (G.out               )
@@ -127,7 +116,6 @@ struct globals {
 #define terminal_width     (G.terminal_width    )
 #define kernel_HZ          (G.kernel_HZ         )
 #define seconds_since_boot (G.seconds_since_boot)
-#define default_o          (G.default_o         )
 #define INIT_G() do { } while (0)
 
 #if ENABLE_FEATURE_PS_TIME
@@ -253,7 +241,7 @@ static void func_comm(char *buf, int size, const procps_status_t *ps)
         safe_strncpy(buf, ps->comm, size+1);
 }
 
-static void func_stat(char *buf, int size, const procps_status_t *ps)
+static void func_state(char *buf, int size, const procps_status_t *ps)
 {
         safe_strncpy(buf, ps->state, size+1);
 }
@@ -404,7 +392,7 @@ static const ps_out_t out_spec[] = {
         { 6                  , "tty"   ,"TT"     ,func_tty   ,PSSCAN_TTY     },
         { 4                  , "vsz"   ,"VSZ"    ,func_vsz   ,PSSCAN_VSZ     },
 /* Not mandated, but useful: */
-        { 4                  , "stat"  ,"STAT"   ,func_stat  ,PSSCAN_STAT    },
+        { 4                  , "stat"  ,"STAT"   ,func_state ,PSSCAN_STATE   },
         { 4                  , "rss"   ,"RSS"    ,func_rss   ,PSSCAN_RSS     },
 #endif
 #if ENABLE_SELINUX
@@ -542,11 +530,21 @@ static void format_process(const procps_status_t *ps)
         printf("%.*s\n", terminal_width, buffer);
 }
 
+#if ENABLE_SELINUX
+# define SELINUX_O_PREFIX "label,"
+# define DEFAULT_O_STR    (SELINUX_O_PREFIX "pid,user" IF_FEATURE_PS_TIME(",time") ",args")
+#elif ENABLE_PLATFORM_MINGW32
+# define DEFAULT_O_STR    ("pid,comm")
+#else
+# define DEFAULT_O_STR    ("pid,user" IF_FEATURE_PS_TIME(",time") ",args")
+#endif
+
 int ps_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int ps_main(int argc UNUSED_PARAM, char **argv)
 {
         procps_status_t *p;
         llist_t* opt_o = NULL;
+        char default_o[sizeof(DEFAULT_O_STR)];
         int opt;
         enum {
                 OPT_Z = (1 << 0),
@@ -584,7 +582,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv)
                         parse_o(llist_pop(&opt_o));
                 } while (opt_o);
         } else {
-                /* Below: parse_o() needs char*, NOT const char*... */
+                /* Below: parse_o() needs char*, NOT const char*, can't give it default_o */
 #if ENABLE_SELINUX
                 if (!(opt & OPT_Z) || !is_selinux_enabled()) {
                         /* no -Z or no SELinux: do not show LABEL */
diff --git a/procps/pstree.c b/procps/pstree.c
index 16649cfaa..8ba30795d 100644
--- a/procps/pstree.c
+++ b/procps/pstree.c
@@ -24,7 +24,6 @@
 //usage:        "[-p] [PID|USER]"
 //usage:#define pstree_full_usage "\n\n"
 //usage:       "Display process tree, optionally start from USER or PID\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -p      Show pids"
 
 #include "libbb.h"
diff --git a/procps/renice.c b/procps/renice.c
index 067c8f75a..77f400a1d 100644
--- a/procps/renice.c
+++ b/procps/renice.c
@@ -23,7 +23,6 @@
 //usage:       "{{-n INCREMENT} | PRIORITY} [[-p | -g | -u] ID...]"
 //usage:#define renice_full_usage "\n\n"
 //usage:       "Change scheduling priority for a running process\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -n      Adjust current nice value (smaller is faster)"
 //usage:     "\n        -p      Process id(s) (default)"
 //usage:     "\n        -g      Process group id(s)"
diff --git a/procps/sysctl.c b/procps/sysctl.c
index f36548f87..cb3b6a25a 100644
--- a/procps/sysctl.c
+++ b/procps/sysctl.c
@@ -15,7 +15,6 @@
 //usage:       "[OPTIONS] [VALUE]..."
 //usage:#define sysctl_full_usage "\n\n"
 //usage:       "Configure kernel parameters at runtime\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -n      Don't print key names"
 //usage:     "\n        -e      Don't warn about unknown keys"
 //usage:     "\n        -w      Change sysctl setting"
diff --git a/procps/watch.c b/procps/watch.c
index e289bf8cb..36af1cca7 100644
--- a/procps/watch.c
+++ b/procps/watch.c
@@ -15,7 +15,6 @@
 //usage:       "[-n SEC] [-t] PROG ARGS"
 //usage:#define watch_full_usage "\n\n"
 //usage:       "Run PROG periodically\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -n      Loop period in seconds (default 2)"
 //usage:     "\n        -t      Don't print header"
 //usage: