5 files changed, 20 insertions, 14 deletions

diff --git a/procps/free.c b/procps/free.c
index 0d023f740..fca9a2242 100644
--- a/procps/free.c
+++ b/procps/free.c
@@ -22,6 +22,7 @@
 //usage:       "Total:       386144       257128       129016\n"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #ifdef __linux__
 # include <sys/sysinfo.h>
 #endif
@@ -35,8 +36,8 @@ struct globals {
 # define G_unit_steps 10
 #endif
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
-#define INIT_G() do { } while (0)
+#define G (*(struct globals*)bb_common_bufsiz1)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 
 static unsigned long long scale(unsigned long d)
diff --git a/procps/fuser.c b/procps/fuser.c
index 05b52abb1..6dac852ed 100644
--- a/procps/fuser.c
+++ b/procps/fuser.c
@@ -18,6 +18,7 @@
 //usage:     "\n        -SIGNAL Signal to send (default: KILL)"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 #define MAX_LINE 255
 
@@ -43,8 +44,9 @@ struct globals {
         smallint kill_failed;
         int killsig;
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
+        setup_common_bufsiz(); \
         G.mypid = getpid(); \
         G.killsig = SIGKILL; \
 } while (0)
diff --git a/procps/nmeter.c b/procps/nmeter.c
index 33de3790f..3eac2d3b2 100644
--- a/procps/nmeter.c
+++ b/procps/nmeter.c
@@ -53,6 +53,7 @@
 //  totalswap=134209536, freeswap=134209536, procs=157})
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 typedef unsigned long long ullong;
 
@@ -108,16 +109,15 @@ struct globals {
 #define proc_meminfo       (G.proc_meminfo      )
 #define proc_diskstats     (G.proc_diskstats    )
 #define proc_sys_fs_filenr (G.proc_sys_fs_filenr)
+#define outbuf bb_common_bufsiz1
 #define INIT_G() do { \
+        setup_common_bufsiz(); \
         SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
         cur_outbuf = outbuf; \
         G.final_char = '\n'; \
         G.deltanz = G.delta = 1000000; \
 } while (0)
 
-// We depend on this being a char[], not char* - we take sizeof() of it
-#define outbuf bb_common_bufsiz1
-
 static inline void reset_outbuf(void)
 {
         cur_outbuf = outbuf;
@@ -140,7 +140,7 @@ static void print_outbuf(void)
 static void put(const char *s)
 {
         char *p = cur_outbuf;
-        int sz = outbuf + sizeof(outbuf) - p;
+        int sz = outbuf + COMMON_BUFSIZE - p;
         while (*s && --sz >= 0)
                 *p++ = *s++;
         cur_outbuf = p;
@@ -148,7 +148,7 @@ static void put(const char *s)
 
 static void put_c(char c)
 {
-        if (cur_outbuf < outbuf + sizeof(outbuf))
+        if (cur_outbuf < outbuf + COMMON_BUFSIZE)
                 *cur_outbuf++ = c;
 }
 
diff --git a/procps/ps.c b/procps/ps.c
index 8c373376d..39cccec82 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -62,6 +62,7 @@
 //usage:       " 2990 andersen andersen R ps\n"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #ifdef __linux__
 # include <sys/sysinfo.h>
 #endif
@@ -144,7 +145,7 @@ struct globals {
         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           )
 #define print_header       (G.print_header      )
@@ -152,7 +153,7 @@ struct globals {
 #define buffer             (G.buffer            )
 #define terminal_width     (G.terminal_width    )
 #define kernel_HZ          (G.kernel_HZ         )
-#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 */
diff --git a/procps/top.c b/procps/top.c
index ddf794d7d..73cd285f0 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -105,6 +105,7 @@
 //config:         Enable 's' in top (gives lots of memory info).
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 
 typedef struct top_status_t {
@@ -183,7 +184,7 @@ struct globals {
         char line_buf[80];
 }; //FIX_ALIASING; - large code growth
 enum { LINE_BUF_SIZE = COMMON_BUFSIZE - offsetof(struct globals, line_buf) };
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define top              (G.top               )
 #define ntop             (G.ntop              )
 #define sort_field       (G.sort_field        )
@@ -201,6 +202,7 @@ enum { LINE_BUF_SIZE = COMMON_BUFSIZE - offsetof(struct globals, line_buf) };
 #define total_pcpu       (G.total_pcpu        )
 #define line_buf         (G.line_buf          )
 #define INIT_G() do { \
+        setup_common_bufsiz(); \
         BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
         BUILD_BUG_ON(LINE_BUF_SIZE <= 80); \
 } while (0)
@@ -263,9 +265,9 @@ static int mult_lvl_cmp(void* a, void* b)
 static NOINLINE int read_cpu_jiffy(FILE *fp, jiffy_counts_t *p_jif)
 {
 #if !ENABLE_FEATURE_TOP_SMP_CPU
-        static const char fmt[] = "cpu %llu %llu %llu %llu %llu %llu %llu %llu";
+        static const char fmt[] ALIGN1 = "cpu %llu %llu %llu %llu %llu %llu %llu %llu";
 #else
-        static const char fmt[] = "cp%*s %llu %llu %llu %llu %llu %llu %llu %llu";
+        static const char fmt[] ALIGN1 = "cp%*s %llu %llu %llu %llu %llu %llu %llu %llu";
 #endif
         int ret;
 
@@ -517,7 +519,7 @@ enum {
 
 static void parse_meminfo(unsigned long meminfo[MI_MAX])
 {
-        static const char fields[] =
+        static const char fields[] ALIGN1 =
                 "MemTotal\0"
                 "MemFree\0"
                 "MemShared\0"