libbb: make bb_common_bufsiz1 1 kbyte, add capability to use bss tail for it

The config item is FEATURE_USE_BSS_TAIL. When it is off (default):

function                                             old     new   delta
read_config                                          210     228     +18
doCommands                                          2279    2294     +15
ipneigh_list_or_flush                                763     772      +9
ipaddr_list_or_flush                                1256    1261      +5
display_process_list                                1301    1306      +5
conspy_main                                         1378    1383      +5
do_lzo_compress                                      352     355      +3
do_lzo_decompress                                    565     567      +2
push                                                  46      44      -2
inetd_main                                          2136    2134      -2
uevent_main                                          421     418      -3
addLines                                              97      92      -5
bb_common_bufsiz1                                   8193    1024   -7169
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 8/5 up/down: 62/-7181)        Total: -7119 bytes
   text	   data	    bss	    dec	    hex	filename
 829850	   4086	   9080	 843016	  cdd08	busybox_old
 829901	   4086	   1904	 835891	  cc133	busybox_unstripped

FEATURE_USE_BSS_TAIL=y:

read_config                                          210     228     +18
doCommands                                          2279    2294     +15
ipneigh_list_or_flush                                763     772      +9
ipaddr_list_or_flush                                1256    1261      +5
display_process_list                                1301    1306      +5
conspy_main                                         1378    1383      +5
do_lzo_compress                                      352     355      +3
do_lzo_decompress                                    565     567      +2
inetd_main                                          2136    2134      -2
bb_common_bufsiz1                                   8193       -   -8193
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 8/1 up/down: 62/-8195)        Total: -8133 bytes
   text	   data	    bss	    dec	    hex	filename
 829850	   4086	   9080	 843016	  cdd08	busybox_old
 829911	   4086	    880	 834877	  cbd3d	busybox_unstripped

FIXME: setup_common_bufsiz() calls are missing.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

5 files changed, 13 insertions, 8 deletions

diff --git a/procps/free.c b/procps/free.c
index 0d023f740..9fde64b64 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,7 +36,7 @@ struct globals {
 # define G_unit_steps 10
 #endif
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { } while (0)
 
 
diff --git a/procps/fuser.c b/procps/fuser.c
index 05b52abb1..2cda0f9d7 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,7 +44,7 @@ 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 { \
 	G.mypid = getpid(); \
 	G.killsig = SIGKILL; \
diff --git a/procps/nmeter.c b/procps/nmeter.c
index 33de3790f..efa3d553d 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;
 
@@ -115,8 +116,8 @@ struct globals {
 	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
+#define        outbuf bb_common_bufsiz1
+#define sizeof_outbuf COMMON_BUFSIZE
 
 static inline void reset_outbuf(void)
 {
@@ -140,7 +141,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 + sizeof_outbuf - p;
 	while (*s && --sz >= 0)
 		*p++ = *s++;
 	cur_outbuf = p;
@@ -148,7 +149,7 @@ static void put(const char *s)
 
 static void put_c(char c)
 {
-	if (cur_outbuf < outbuf + sizeof(outbuf))
+	if (cur_outbuf < outbuf + sizeof_outbuf)
 		*cur_outbuf++ = c;
 }
 
diff --git a/procps/ps.c b/procps/ps.c
index fbafa68a9..65d62e256 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      )
diff --git a/procps/top.c b/procps/top.c
index ddf794d7d..1c42b249c 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        )