Merge branch 'busybox' into merge

7 files changed, 64 insertions, 48 deletions

diff --git a/procps/free.c b/procps/free.c
index 142786083..f19c38dd5 100644
--- a/procps/free.c
+++ b/procps/free.c
@@ -19,9 +19,9 @@
 //kbuild:lib-$(CONFIG_FREE) += free.o
 
 //usage:#define free_trivial_usage
-//usage:       "" IF_DESKTOP("[-b/k/m/g]")
+//usage:       "" IF_DESKTOP("[-bkmgh]")
 //usage:#define free_full_usage "\n\n"
-//usage:       "Display the amount of free and used system memory"
+//usage:       "Display free and used memory"
 //usage:
 //usage:#define free_example_usage
 //usage:       "$ free\n"
@@ -29,6 +29,27 @@
 //usage:       "  Mem:       257628       248724         8904        59644        93124\n"
 //usage:       " Swap:       128516         8404       120112\n"
 //usage:       "Total:       386144       257128       129016\n"
+//procps-ng 3.3.15:
+// -b, --bytes         show output in bytes
+//     --kilo          show output in kilobytes
+//     --mega          show output in megabytes
+//     --giga          show output in gigabytes
+//     --tera          show output in terabytes
+//     --peta          show output in petabytes
+// -k, --kibi          show output in kibibytes
+// -m, --mebi          show output in mebibytes
+// -g, --gibi          show output in gibibytes
+//     --tebi          show output in tebibytes
+//     --pebi          show output in pebibytes
+// -h, --human         show human-readable output
+//     --si            use powers of 1000 not 1024
+// -l, --lohi          show detailed low and high memory statistics
+// -t, --total         show total for RAM + swap
+// -s N, --seconds N   repeat printing every N seconds
+// -c N, --count N     repeat printing N times, then exit
+// -w, --wide          wide output
+//
+//NB: if we implement -s or -c, need to stop being NOFORK!
 
 #include "libbb.h"
 #ifdef __linux__
@@ -38,18 +59,22 @@
 struct globals {
         unsigned mem_unit;
 #if ENABLE_DESKTOP
-        uint8_t unit_steps;
-# define G_unit_steps g->unit_steps
+        unsigned unit;
+# define G_unit g->unit
 #else
-# define G_unit_steps 10
+# define G_unit (1 << 10)
 #endif
         unsigned long cached_kb, available_kb, reclaimable_kb;
 };
 /* Because of NOFORK, "globals" are not in global data */
 
-static unsigned long long scale(struct globals *g, unsigned long d)
+static const char *scale(struct globals *g, unsigned long d)
 {
-        return ((unsigned long long)d * g->mem_unit) >> G_unit_steps;
+        /* Display (size * block_size) with one decimal digit.
+         * If display_unit == 0, show value no bigger than 1024 with suffix (K,M,G...),
+         * else divide by display_unit and do not use suffix.
+         * Returns "auto pointer" */
+        return make_human_readable_str(d, g->mem_unit, G_unit);
 }
 
 #if !ENABLE_PLATFORM_MINGW32
@@ -97,20 +122,27 @@ int free_main(int argc UNUSED_PARAM, char **argv IF_NOT_DESKTOP(UNUSED_PARAM))
         int seen_available;
 
 #if ENABLE_DESKTOP
-        G.unit_steps = 10;
+        G.unit = 1 << 10;
         if (argv[1] && argv[1][0] == '-') {
                 switch (argv[1][1]) {
                 case 'b':
-                        G.unit_steps = 0;
+                        G.unit = 1;
                         break;
                 case 'k': /* 2^10 */
-                        /* G.unit_steps = 10; - already is */
+                        /* G.unit = 1 << 10; - already is */
                         break;
                 case 'm': /* 2^20 */
-                        G.unit_steps = 20;
+                        G.unit = 1 << 20;
                         break;
                 case 'g': /* 2^30 */
-                        G.unit_steps = 30;
+                        G.unit = 1 << 30;
+                        break;
+//              case 't':
+// -- WRONG, -t is not "terabytes" in procps-ng, it's --total
+//                      G.unit = 1 << 40;
+//                      break;
+                case 'h':
+                        G.unit = 0; /* human readable */
                         break;
                 default:
                         bb_show_usage();
@@ -135,29 +167,13 @@ int free_main(int argc UNUSED_PARAM, char **argv IF_NOT_DESKTOP(UNUSED_PARAM))
         cached += ((unsigned long long) G.reclaimable_kb * 1024) / G.mem_unit;
         cached_plus_free = cached + info.freeram;
 
-/* In case (long long * G.mem_unit) can overflow, this can be used to reduce the chances */
-#if 0 //ENABLE_DESKTOP
-        while (!(G.mem_unit & 1) && G.unit_steps != 0) {
-                G.mem_unit >>= 1;
-                G.unit_steps--;
-                //bb_error_msg("mem_unit:%d unit_steps:%d", G.mem_unit, G.unit_steps);
-        }
-#endif
-
-#if !ENABLE_PLATFORM_MINGW32
-#define FIELDS_6 "%12llu %11llu %11llu %11llu %11llu %11llu\n"
-#define FIELDS_3 (FIELDS_6 + 6 + 7 + 7)
-#define FIELDS_2 (FIELDS_6 + 6 + 7 + 7 + 7)
-#else
-#define FIELDS_6 "%12I64u %11I64u %11I64u %11I64u %11I64u %11I64u\n"
-#define FIELDS_3 (FIELDS_6 + 7 + 8 + 8)
-#define FIELDS_2 (FIELDS_6 + 8 + 8 + 8 + 8)
-#endif
-
-        printf(FIELDS_6,
+        printf("%12s%12s%12s",
                 scale(&G, info.totalram),                //total
                 scale(&G, info.totalram - cached_plus_free), //used
-                scale(&G, info.freeram),                 //free
+                scale(&G, info.freeram)                  //free
+        );
+        /* using two printf's: only 4 auto strings are supported, we need 6 */
+        printf("%12s%12s%12s\n",
                 scale(&G, info.sharedram),               //shared
                 scale(&G, cached),                       //buff/cache
                 scale(&G, available)                     //available
@@ -167,14 +183,14 @@ int free_main(int argc UNUSED_PARAM, char **argv IF_NOT_DESKTOP(UNUSED_PARAM))
          * buffer cache as free memory. */
         if (!seen_available) {
                 printf("-/+ buffers/cache: ");
-                printf(FIELDS_2,
+                printf("%12s%12s%12s\n" + 4,
                         scale(&G, info.totalram - cached_plus_free), //used
                         scale(&G, cached_plus_free)                  //free
                 );
         }
 #if BB_MMU
         printf("Swap:  ");
-        printf(FIELDS_3,
+        printf("%12s%12s%12s\n",
                 scale(&G, info.totalswap),                 //total
                 scale(&G, info.totalswap - info.freeswap), //used
                 scale(&G, info.freeswap)                   //free
diff --git a/procps/kill.c b/procps/kill.c
index 358d8f42b..8c2bc2b6f 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -59,7 +59,7 @@
 //usage:       "$ kill 252\n"
 //usage:
 //usage:#define killall_trivial_usage
-//usage:       "[-l] [-q] [-SIG] PROCESS_NAME..."
+//usage:       "[-lq] [-SIG] PROCESS_NAME..."
 //usage:#define killall_full_usage "\n\n"
 //usage:       "Send a signal (default: TERM) to given processes\n"
 //usage:     "\n        -l      List all signal names and numbers"
diff --git a/procps/lsof.c b/procps/lsof.c
index 21ac85ed3..9cb8d066c 100644
--- a/procps/lsof.c
+++ b/procps/lsof.c
@@ -66,7 +66,7 @@ int lsof_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 
                                 safe_strncpy(name + baseofs, entry->d_name, 10);
                                 if ((fdlink = xmalloc_readlink(name)) != NULL) {
-                                        printf("%d\t%s\t%s\n", proc->pid, proc->exe, fdlink);
+                                        printf("%d\t%s\t%s\t%s\n", proc->pid, proc->exe, entry->d_name, fdlink);
                                         free(fdlink);
                                 }
                         }
diff --git a/procps/pgrep.c b/procps/pgrep.c
index 495e0ef9d..6d25c247e 100644
--- a/procps/pgrep.c
+++ b/procps/pgrep.c
@@ -44,17 +44,17 @@
 //usage:     "\n        -P      Match parent process ID"
 //usage:
 //usage:#define pkill_trivial_usage
-//usage:       "[-l|-SIGNAL] [-fnovx] [-s SID|-P PPID|PATTERN]"
+//usage:       "[-l|-SIGNAL] [-xfvno] [-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:       "Send signal to processes selected by regex PATTERN\n"
 //usage:     "\n        -l      List all signals"
+//usage:     "\n        -x      Match whole name (not substring)"
 //usage:     "\n        -f      Match against entire command line"
+//usage:     "\n        -s SID  Match session ID (0 for current)"
+//usage:     "\n        -P PPID Match parent process ID"
+//usage:     "\n        -v      Negate the match"
 //usage:     "\n        -n      Signal the newest process only"
 //usage:     "\n        -o      Signal the oldest process only"
-//usage:     "\n        -v      Negate the match"
-//usage:     "\n        -x      Match whole name (not substring)"
-//usage:     "\n        -s      Match session ID (0 for current)"
-//usage:     "\n        -P      Match parent process ID"
 
 #include "libbb.h"
 #include "xregex.h"
diff --git a/procps/sysctl.c b/procps/sysctl.c
index e16b119e9..40afa0c90 100644
--- a/procps/sysctl.c
+++ b/procps/sysctl.c
@@ -21,16 +21,16 @@
 //kbuild:lib-$(CONFIG_BB_SYSCTL) += sysctl.o
 
 //usage:#define sysctl_trivial_usage
-//usage:       "-p [-enq] [FILE...] / [-enqaw] [KEY[=VALUE]]..."
+//usage:       "[-enq] { -a | -p [FILE]... | [-w] [KEY[=VALUE]]... }"
 //usage:#define sysctl_full_usage "\n\n"
 //usage:       "Show/set kernel parameters\n"
-//usage:     "\n        -p      Set values from FILEs (default /etc/sysctl.conf)"
 //usage:     "\n        -e      Don't warn about unknown keys"
 //usage:     "\n        -n      Don't show key names"
 //usage:     "\n        -q      Quiet"
 //usage:     "\n        -a      Show all values"
 /* Same as -a, no need to show it */
 /* //usage:     "\n     -A      Show all values in table form" */
+//usage:     "\n        -p      Set values from FILEs (default /etc/sysctl.conf)"
 //usage:     "\n        -w      Set values"
 //usage:
 //usage:#define sysctl_example_usage
diff --git a/procps/top.c b/procps/top.c
index cadc4ecec..4cd545c69 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -1052,9 +1052,9 @@ static unsigned handle_input(unsigned scan_mask, duration_t interval)
 //usage:       "[-b"IF_FEATURE_TOPMEM("m")IF_FEATURE_SHOW_THREADS("H")"]"
 //usage:       " [-n COUNT] [-d SECONDS]"
 //usage:#define top_full_usage "\n\n"
-//usage:       "Provide a view of process activity in real time."
+//usage:       "Show a view of process activity in real time."
 //usage:   "\n""Read the status of all processes from /proc each SECONDS"
-//usage:   "\n""and display a screenful of them."
+//usage:   "\n""and show a screenful of them."
 //usage:   "\n"
 //usage:        IF_FEATURE_TOP_INTERACTIVE(
 //usage:       "Keys:"
diff --git a/procps/watch.c b/procps/watch.c
index 059eb1dda..1190b29df 100644
--- a/procps/watch.c
+++ b/procps/watch.c
@@ -22,7 +22,7 @@
 //usage:       "[-n SEC] [-t] PROG ARGS"
 //usage:#define watch_full_usage "\n\n"
 //usage:       "Run PROG periodically\n"
-//usage:     "\n        -n SEC  Loop period (default 2)"
+//usage:     "\n        -n SEC  Period (default 2)"
 //usage:     "\n        -t      Don't print header"
 //usage:
 //usage:#define watch_example_usage