6 files changed, 23 insertions, 21 deletions

diff --git a/procps/free.c b/procps/free.c
index b33506b9e..0adef501f 100644
--- a/procps/free.c
+++ b/procps/free.c
@@ -97,10 +97,10 @@ int free_main(int argc UNUSED_PARAM, char **argv IF_NOT_DESKTOP(UNUSED_PARAM))
                 case 'k': /* 2^10 */
                         /* G.unit_steps = 10; - already is */
                         break;
-                case 'm': /* 2^(2*10) */
+                case 'm': /* 2^20 */
                         G.unit_steps = 20;
                         break;
-                case 'g': /* 2^(3*10) */
+                case 'g': /* 2^30 */
                         G.unit_steps = 30;
                         break;
                 default:
@@ -117,16 +117,24 @@ int free_main(int argc UNUSED_PARAM, char **argv IF_NOT_DESKTOP(UNUSED_PARAM))
         );
 
         sysinfo(&info);
-        /* Kernels prior to 2.4.x will return info.mem_unit==0, so cope... */
-        G.mem_unit = (info.mem_unit ? info.mem_unit : 1);
         /* Extract cached and memavailable from /proc/meminfo and convert to mem_units */
         seen_available = parse_meminfo(&G);
+        G.mem_unit = (info.mem_unit ? info.mem_unit : 1); /* kernels < 2.4.x return mem_unit==0, so cope */
         available = ((unsigned long long) G.available_kb * 1024) / G.mem_unit;
         cached = ((unsigned long long) G.cached_kb * 1024) / G.mem_unit;
         cached += info.bufferram;
         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
+
 #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)
diff --git a/procps/fuser.c b/procps/fuser.c
index 418f57b57..191746751 100644
--- a/procps/fuser.c
+++ b/procps/fuser.c
@@ -19,7 +19,7 @@
 //kbuild:lib-$(CONFIG_FUSER) += fuser.o
 
 //usage:#define fuser_trivial_usage
-//usage:       "[OPTIONS] FILE or PORT/PROTO"
+//usage:       "[-msk46] [-SIGNAL] FILE or PORT/PROTO"
 //usage:#define fuser_full_usage "\n\n"
 //usage:       "Find processes which use FILEs or PORTs\n"
 //usage:     "\n        -m      Find processes which use same fs as FILEs"
diff --git a/procps/nmeter.c b/procps/nmeter.c
index 856ce0202..f08938654 100644
--- a/procps/nmeter.c
+++ b/procps/nmeter.c
@@ -838,7 +838,7 @@ static void FAST_FUNC collect_info(s_stat *s)
 typedef s_stat* init_func(const char *param);
 
 static const char options[] ALIGN1 = "ncmsfixptTbr";
-static init_func *const init_functions[] = {
+static init_func *const init_functions[] ALIGN_PTR = {
         init_if,
         init_cpu,
         init_mem,
@@ -952,11 +952,11 @@ int nmeter_main(int argc UNUSED_PARAM, char **argv)
         reset_outbuf();
 
         if (G.delta >= 0) {
-                gettimeofday(&G.tv, NULL);
+                xgettimeofday(&G.tv);
                 usleep(G.delta > 1000000 ? 1000000 : G.delta - G.tv.tv_usec % G.deltanz);
         }
 
-        gettimeofday(&G.start, NULL);
+        xgettimeofday(&G.start);
         G.tv = G.start;
         while (1) {
                 collect_info(first);
@@ -971,7 +971,7 @@ int nmeter_main(int argc UNUSED_PARAM, char **argv)
                 if (G.delta >= 0) {
                         int rem;
                         // can be commented out, will sacrifice sleep time precision a bit
-                        gettimeofday(&G.tv, NULL);
+                        xgettimeofday(&G.tv);
                         if (need_seconds)
                                 rem = G.delta - ((ullong)G.tv.tv_sec*1000000 + G.tv.tv_usec) % G.deltanz;
                         else
@@ -983,7 +983,7 @@ int nmeter_main(int argc UNUSED_PARAM, char **argv)
                         }
                         usleep(rem);
                 }
-                gettimeofday(&G.tv, NULL);
+                xgettimeofday(&G.tv);
         }
 
         /*return 0;*/
diff --git a/procps/pidof.c b/procps/pidof.c
index 5595e3421..b81709a81 100644
--- a/procps/pidof.c
+++ b/procps/pidof.c
@@ -39,7 +39,7 @@
 
 //usage:#if (ENABLE_FEATURE_PIDOF_SINGLE || ENABLE_FEATURE_PIDOF_OMIT)
 //usage:#define pidof_trivial_usage
-//usage:       "[OPTIONS] [NAME]..."
+//usage:       IF_FEATURE_PIDOF_SINGLE("[-s] ")IF_FEATURE_PIDOF_OMIT("[-o PID] ")"[NAME]..."
 //usage:#define USAGE_PIDOF "\n"
 //usage:#else
 //usage:#define pidof_trivial_usage
diff --git a/procps/pmap.c b/procps/pmap.c
index 9e541c707..408cbfce7 100644
--- a/procps/pmap.c
+++ b/procps/pmap.c
@@ -27,20 +27,14 @@
 
 #include "libbb.h"
 
-#if ULONG_MAX == 0xffffffff
+#if ULLONG_MAX == 0xffffffff
 # define TABS "\t"
-# define AFMT "8"
+# define AFMTLL "8"
 # define DASHES ""
 #else
 # define TABS "\t\t"
-# define AFMT "16"
-# define DASHES "--------"
-#endif
-
-#if ULLONG_MAX == 0xffffffff
-# define AFMTLL "8"
-#else
 # define AFMTLL "16"
+# define DASHES "--------"
 #endif
 
 enum {
diff --git a/procps/ps.c b/procps/ps.c
index a4de11379..f84060447 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -381,7 +381,7 @@ static void func_pcpu(char *buf, int size, const procps_status_t *ps)
 }
 */
 
-static const ps_out_t out_spec[] = {
+static const ps_out_t out_spec[] ALIGN_PTR = {
 /* Mandated by http://pubs.opengroup.org/onlinepubs/9699919799/utilities/ps.html: */
         { 8                  , "user"  ,"USER"   ,func_user  ,PSSCAN_UIDGID  },
         { 8                  , "group" ,"GROUP"  ,func_group ,PSSCAN_UIDGID  },