*: add most of the required setup_common_bufsiz() calls

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

diff --git a/archival/cpio.c b/archival/cpio.c
index a3036e1ab3c2dbbc0e2790a4279dd0b31f862b63..3b15507200e770176bf2212951ee092189ebb528 100644 (file)
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -174,6 +174,7 @@ struct globals {
 #define G (*(struct globals*)bb_common_bufsiz1)
 void BUG_cpio_globals_too_big(void);
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        G.owner_ugid.uid = -1L; \
        G.owner_ugid.gid = -1L; \
 } while (0)

diff --git a/archival/lzop.c b/archival/lzop.c
index 1371c97519f7abb15fc1981d6b58df9c9316abfa..4afa218896b49fe681deb65fbc0dc0906e316e0f 100644 (file)
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -445,7 +445,7 @@ struct globals {
        chksum_t chksum_out;
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
-#define INIT_G() do { } while (0)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 //#define G (*ptr_to_globals)
 //#define INIT_G() do {
 //     SET_PTR_TO_GLOBALS(xzalloc(sizeof(G)));

diff --git a/archival/rpm.c b/archival/rpm.c
index 079b7a95b7ded2845441220eaab2908751739e0e..83160f975eaecd5671cb3c0628cce1f9e9bc4f1e 100644 (file)
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -95,7 +95,7 @@ struct globals {
        int tagcount;
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
-#define INIT_G() do { } while (0)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 static void extract_cpio(int fd, const char *source_rpm)
 {

diff --git a/console-tools/resize.c b/console-tools/resize.c
index ed80aa082c87ada9708bad936711b70c2eda56b1..a3342a1956bc43550450a98e850e8d79777afaee 100644 (file)
--- a/console-tools/resize.c
+++ b/console-tools/resize.c
@@ -19,6 +19,7 @@
 #define ESC "\033"
 
 #define old_termios_p ((struct termios*)bb_common_bufsiz1)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 static void
 onintr(int sig UNUSED_PARAM)
@@ -34,6 +35,8 @@ int resize_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
        struct winsize w = { 0, 0, 0, 0 };
        int ret;
 
+       INIT_G();
+
        /* We use _stderr_ in order to make resize usable
         * in shell backticks (those redirect stdout away from tty).
         * NB: other versions of resize open "/dev/tty"

diff --git a/coreutils/dd.c b/coreutils/dd.c
index a5b8882a0fb11caf194f407fe589f9661b2349bd..4dc3029260cd960df45e6ed6ef99655725c9c01e 100644 (file)
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -111,6 +111,7 @@ struct globals {
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        /* we have to zero it out because of NOEXEC */ \
        memset(&G, 0, sizeof(G)); \
 } while (0)

diff --git a/coreutils/du.c b/coreutils/du.c
index 3d6777670ac84d4d7a924a16a21fa464ec7beb9a..1240bcbbc3316f3dca93a0ad34eb9d0cd7de69b0 100644 (file)
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -87,7 +87,7 @@ struct globals {
        dev_t dir_dev;
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
-#define INIT_G() do { } while (0)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 
 static void print(unsigned long long size, const char *filename)

diff --git a/coreutils/expr.c b/coreutils/expr.c
index 59a66d9c517da0a6ca98b4540df2c7179db4c773..ce6b2d18910b962fe199b54629be44316111307f 100644 (file)
--- a/coreutils/expr.c
+++ b/coreutils/expr.c
@@ -101,7 +101,7 @@ struct globals {
        char **args;
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
-#define INIT_G() do { } while (0)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 /* forward declarations */
 static VALUE *eval(void);

diff --git a/coreutils/ls.c b/coreutils/ls.c
index e8c3e0490ef1f767e10b3341052606825634fd46..344b4e61e5953fa1ff4b8ee1a7dbc9d3ce9304c3 100644 (file)
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -368,6 +368,7 @@ struct globals {
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        /* we have to zero it out because of NOEXEC */ \
        memset(&G, 0, sizeof(G)); \
        IF_FEATURE_AUTOWIDTH(G_terminal_width = TERMINAL_WIDTH;) \

diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index 1e252caf097241b6745a8c466a36a9525df56f8b..c8a6541654fd399ea58793db21e527ecaa9fb3f3 100644 (file)
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -217,6 +217,7 @@ enum { G_pseudo_offset = 0 };
 #endif
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
        G.bytes_per_block = 32; \
 } while (0)

diff --git a/coreutils/tail.c b/coreutils/tail.c
index cdc9fb66a6bf5bd05497543860887ef597181c6e..39f87679e95db8523ddab7964269cd4786b3ebcc 100644 (file)
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -56,7 +56,7 @@ struct globals {
        bool exitcode;
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
-#define INIT_G() do { } while (0)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 static void tail_xprint_header(const char *fmt, const char *filename)
 {

diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c
index a5e53576cb7363cfaab59df78e1eea038984370a..c671b9252abc8dc463da23e90138795daea81d5b 100644 (file)
--- a/debianutils/run_parts.c
+++ b/debianutils/run_parts.c
@@ -100,7 +100,7 @@ struct globals {
 #define names (G.names)
 #define cur   (G.cur  )
 #define cmd   (G.cmd  )
-#define INIT_G() do { } while (0)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 enum { NUM_CMD = (COMMON_BUFSIZE - sizeof(G)) / sizeof(cmd[0]) - 1 };
 

diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index 6b8d53b134e6b21c226ec146ddb22af619ae9be5..3625ffee888d0d3bcc88b07a771d110cbb680bef 100644 (file)
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -200,6 +200,7 @@ struct globals {
 #define user_id           (G.user_id             )
 #define signal_nr         (G.signal_nr           )
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        user_id = -1; \
        signal_nr = 15; \
 } while (0)

diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c
index b534568c2ffd27beefffb9461b8b45985860f8bc..59514a1a6c629c6bd63d71c8c6befd92a76da76d 100644 (file)
--- a/e2fsprogs/fsck.c
+++ b/e2fsprogs/fsck.c
@@ -172,6 +172,7 @@ struct globals {
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
 } while (0)
 

diff --git a/editors/sed.c b/editors/sed.c
index 330190e78db64cdaa3e482f5bb59e2615d41f766..ed48de17f4baaca307e93a5225bc42e18c86ea6c 100644 (file)
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -164,6 +164,7 @@ struct globals {
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
        G.sed_cmd_tail = &G.sed_cmd_head; \
 } while (0)

diff --git a/findutils/find.c b/findutils/find.c
index 32d830337f1d4040e27e181dbe71954aee07f5c7..d71c697827079c7d12e3c627beae89c33e528377 100644 (file)
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -424,6 +424,7 @@ struct globals {
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
        /* we have to zero it out because of NOEXEC */ \
        memset(&G, 0, sizeof(G)); \

diff --git a/findutils/grep.c b/findutils/grep.c
index a669ac80bb714af852d03651a7e90df107969fe6..b072cd44126f7f4abb16dcc0fa3edde752d47226 100644 (file)
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -204,6 +204,7 @@ struct globals {
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
 } while (0)
 #define max_matches       (G.max_matches         )

diff --git a/findutils/xargs.c b/findutils/xargs.c
index bfbd949606b5a1202135e6efe0d22584d432b129..ae01a49beaf8cb151ddece900e50df613d22bb84 100644 (file)
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -103,6 +103,7 @@ struct globals {
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        G.eof_str = NULL; /* need to clear by hand because we are NOEXEC applet */ \
        IF_FEATURE_XARGS_SUPPORT_REPL_STR(G.repl_str = "{}";) \
        IF_FEATURE_XARGS_SUPPORT_REPL_STR(G.eol_ch = '\n';) \

diff --git a/init/bootchartd.c b/init/bootchartd.c
index 5101b28aeba57f697158a801d12dae44bfb64a51..7f511e650ddde7941286c97c7db31b10a83af788 100644 (file)
--- a/init/bootchartd.c
+++ b/init/bootchartd.c
@@ -117,7 +117,7 @@ struct globals {
        char jiffy_line[COMMON_BUFSIZE];
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
-#define INIT_G() do { } while (0)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 static void dump_file(FILE *fp, const char *filename)
 {

diff --git a/loginutils/login.c b/loginutils/login.c
index ea7c5a23d4535b61fe2fe4f1814fb7a0fea0b4cd..94b6c45db33c969c695156743745e0d9183e8d2d 100644 (file)
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -140,7 +140,7 @@ struct globals {
        struct termios tty_attrs;
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
-#define INIT_G() do { } while (0)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 
 #if ENABLE_FEATURE_NOLOGIN

diff --git a/miscutils/crond.c b/miscutils/crond.c
index 8536d43c592cff3bd4022b9a1bf01ae3c01a43de..f96c96ee7bf1d04309b34083d89c4ec977918f36 100644 (file)
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -143,6 +143,7 @@ struct globals {
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        G.log_level = 8; \
        G.crontab_dir_name = CRONTABS; \
 } while (0)

diff --git a/miscutils/dc.c b/miscutils/dc.c
index 3fbb89f5b88960819fba39a144cfa7cad4c13bbe..4d92bc3d04244359849d663bbd31611f041ee927 100644 (file)
--- a/miscutils/dc.c
+++ b/miscutils/dc.c
@@ -53,6 +53,7 @@ enum { STACK_SIZE = (COMMON_BUFSIZE - offsetof(struct globals, stack)) / sizeof(
 #define base      (G.base      )
 #define stack     (G.stack     )
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        base = 10; \
 } while (0)
 

diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index 9e141de2f110be75262ffd369d0aaf03c3c3ad5c..b4c5876d468ca0b5817a6d4c2689cb2e9bdeb080 100644 (file)
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -432,6 +432,7 @@ struct globals {
 #define hwif_ctrl          (G.hwif_ctrl              )
 #define hwif_irq           (G.hwif_irq               )
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
 } while (0)
 

diff --git a/networking/arp.c b/networking/arp.c
index 5f7818663a96a866298f35eb2f8628e2a0bb0f51..9381eb53a6e1ecaafc95e2e3650859d8db7deedb 100644 (file)
--- a/networking/arp.c
+++ b/networking/arp.c
@@ -76,6 +76,7 @@ struct globals {
 #define device     (G.device    )
 #define hw_set     (G.hw_set    )
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        device = ""; \
 } while (0)
 

diff --git a/networking/arping.c b/networking/arping.c
index 52f5ba51fbd6c991f85578a67c066d14251bb1c3..6b0de4de290bd6b9524228523b118253a712bed0 100644 (file)
--- a/networking/arping.c
+++ b/networking/arping.c
@@ -77,6 +77,7 @@ struct globals {
 #define brd_recv   (G.brd_recv  )
 #define req_recv   (G.req_recv  )
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        count = -1; \
 } while (0)
 

diff --git a/networking/ftpd.c b/networking/ftpd.c
index 8553a28f59d54983cec81e1658e54a5d464adb64..360d1e6be6901d3b7b6cd233e68d5f9b6d93b947 100644 (file)
--- a/networking/ftpd.c
+++ b/networking/ftpd.c
@@ -126,6 +126,7 @@ struct globals {
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        /* Moved to main */ \
        /*strcpy(G.msg_ok  + 4, MSG_OK );*/ \
        /*strcpy(G.msg_err + 4, MSG_ERR);*/ \

diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index 61bc45c4e3c919b7aa336aa6628f8537639f9162..91fb4569afb8d8528329168419e003b998d7928c 100644 (file)
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -71,6 +71,7 @@ enum { BUFSZ = COMMON_BUFSIZE - offsetof(struct globals, buf) };
 #define do_continue    (G.do_continue   )
 #define buf            (G.buf           )
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
 } while (0)
 

diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 399ff6b5d080d694408e15447211f24119b7fe5c..25b04c9d75cc61da4575eb13606dce9d3ba34d83 100644 (file)
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -131,7 +131,7 @@ struct globals {
        char *shell;
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
-#define INIT_G() do { } while (0)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 
 static const char keywords_up_down[] ALIGN1 =

diff --git a/networking/inetd.c b/networking/inetd.c
index aa35ffa2b879414634bb145a246ac10168b68ac5..8d44b5198add30342d857ce7da4efc67125aefe3 100644 (file)
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -350,6 +350,7 @@ enum { LINE_SIZE = COMMON_BUFSIZE - offsetof(struct globals, line) };
 #define allsock         (G.allsock        )
 #define line            (G.line           )
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
        rlim_ofile_cur = OPEN_MAX; \
        global_queuelen = 128; \

diff --git a/networking/ping.c b/networking/ping.c
index 761660979ff05a6b12734ca33ec989c844057e6c..cfe682646a2ddb10d3a70124db90ff784b8f675e 100644 (file)
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -188,7 +188,7 @@ struct globals {
        char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN];
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
-#define INIT_G() do { } while (0)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 static void noresp(int ign UNUSED_PARAM)
 {
@@ -398,6 +398,7 @@ struct globals {
 #define pingaddr     (G.pingaddr    )
 #define rcvd_tbl     (G.rcvd_tbl    )
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
        datalen = DEFDATALEN; \
        timeout = MAXWAIT; \

diff --git a/networking/slattach.c b/networking/slattach.c
index d9d8fe7b8c060e116106b683b45a5e11079b5742..2d1305e32abf6a9c08699baf5dd33fadb48ad305 100644 (file)
--- a/networking/slattach.c
+++ b/networking/slattach.c
@@ -39,7 +39,7 @@ struct globals {
 #define handle       (G.handle      )
 #define saved_disc   (G.saved_disc  )
 #define saved_state  (G.saved_state )
-#define INIT_G() do { } while (0)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 
 /*

diff --git a/networking/tc.c b/networking/tc.c
index 1372ca0810c042300479d173ccaa1e5467e7fa74..d0bcbdeaa6ed83f7d721a53d54532fafb23bb634 100644 (file)
--- a/networking/tc.c
+++ b/networking/tc.c
@@ -71,6 +71,7 @@ struct globals {
 #define filter_prio (G.filter_prio)
 #define filter_proto (G.filter_proto)
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
 } while (0)
 

diff --git a/networking/tcpudp.c b/networking/tcpudp.c
index 6249730424764104605f6d6122a7a3f1ad79e7cd..31bc704594833f2781c2cee35ddaf1942eeb84bf 100644 (file)
--- a/networking/tcpudp.c
+++ b/networking/tcpudp.c
@@ -101,6 +101,7 @@ struct globals {
 #define env_cur      (G.env_cur     )
 #define env_var      (G.env_var     )
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        cmax = 30; \
        env_cur = &env_var[0]; \
 } while (0)

diff --git a/networking/telnet.c b/networking/telnet.c
index 2946bc831e38d852b78834a4f24fbff9b35088f9..d2daf5c8ce925e38ba3ddba2307873e8cfcec7e7 100644 (file)
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -111,6 +111,7 @@ struct globals {
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
 } while (0)
 

diff --git a/networking/telnetd.c b/networking/telnetd.c
index 13d5a8f649cc6575253e711328bdd991b5fe5514..13c36aa4645ffdf32bbd0c983db82e20c204f29b 100644 (file)
--- a/networking/telnetd.c
+++ b/networking/telnetd.c
@@ -85,6 +85,7 @@ struct globals {
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        G.loginpath = "/bin/login"; \
        G.issuefile = "/etc/issue.net"; \
 } while (0)

diff --git a/networking/tftp.c b/networking/tftp.c
index 8aeb79aca8b4a171ab1a8c70e130eec7f4ffc669..e879c4674cee7e5e4efb3b75347ce55a11a29f3e 100644 (file)
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -131,6 +131,7 @@ struct globals {
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
 } while (0)
 

diff --git a/networking/udhcp/dhcprelay.c b/networking/udhcp/dhcprelay.c
index 1722a85deb080ce1343c9db9e95732e34ce06df7..f52a0cf881735dc096f70312b97f05c78d86bf37 100644 (file)
--- a/networking/udhcp/dhcprelay.c
+++ b/networking/udhcp/dhcprelay.c
@@ -34,6 +34,7 @@ struct xid_item {
 } FIX_ALIASING;
 
 #define dhcprelay_xid_list (*(struct xid_item*)bb_common_bufsiz1)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 static struct xid_item *xid_add(uint32_t xid, struct sockaddr_in *ip, int client)
 {
@@ -257,6 +258,8 @@ int dhcprelay_main(int argc, char **argv)
        int num_sockets, max_socket;
        uint32_t our_nip;
 
+       INIT_G();
+
        server_addr.sin_family = AF_INET;
        server_addr.sin_addr.s_addr = htonl(INADDR_BROADCAST);
        server_addr.sin_port = htons(SERVER_PORT);

diff --git a/networking/zcip.c b/networking/zcip.c
index 79643458c60aa5c057d5eed9df75babf5f9bf0f1..47f3216a0c12a41af803903ecd3a52dd9af7cf8b 100644 (file)
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -92,7 +92,7 @@ struct globals {
        uint32_t localnet_ip;
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
-#define INIT_G() do { } while (0)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 
 /**

diff --git a/procps/free.c b/procps/free.c
index 9fde64b64b714e7d0c2d95033beaa0e51a9bf672..fca9a2242633c72b42b3cede2462db15a82c205b 100644 (file)
--- a/procps/free.c
+++ b/procps/free.c
@@ -37,7 +37,7 @@ struct globals {
 #endif
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
-#define INIT_G() do { } while (0)
+#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 2cda0f9d7914f53aef1fa7ad8649cb9d15ea9ea0..6dac852ed1fafc3c74a1c1791f96148903502594 100644 (file)
--- a/procps/fuser.c
+++ b/procps/fuser.c
@@ -46,6 +46,7 @@ struct globals {
 } FIX_ALIASING;
 #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/ps.c b/procps/ps.c
index 65d62e256af9432d3a239969c48a02446ac1d9c4..08dfce12e18b43140711fe3c53df43fc2c8bd75f 100644 (file)
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -153,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 1c42b249c37ee350f7cd2a600560606da245e046..640bcdc6d372467d739f1e2d783cd9dfc42c1f87 100644 (file)
--- a/procps/top.c
+++ b/procps/top.c
@@ -202,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)

diff --git a/runit/runsv.c b/runit/runsv.c
index 8833f4c96c22239caa52360c3a35becc504a71eb..e0e31508a486175e6bf1f7dc0461c995cfa9da3c 100644 (file)
--- a/runit/runsv.c
+++ b/runit/runsv.c
@@ -115,6 +115,7 @@ struct globals {
 #define dir          (G.dir         )
 #define svd          (G.svd         )
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        pidchanged = 1; \
 } while (0)
 

diff --git a/runit/runsvdir.c b/runit/runsvdir.c
index 49c8f5b48e20e27316090159b1bbd66233f36d4b..2b7927542aeb37725b9af933ead0532451636a9f 100644 (file)
--- a/runit/runsvdir.c
+++ b/runit/runsvdir.c
@@ -93,7 +93,7 @@ struct globals {
 #define logpipe     (G.logpipe     )
 #define pfd         (G.pfd         )
 #define stamplog    (G.stamplog    )
-#define INIT_G() do { } while (0)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 static void fatal2_cannot(const char *m1, const char *m2)
 {

diff --git a/runit/sv.c b/runit/sv.c
index e83a297811d85b6d6f0341146673f38b16afd0f0..2a256a6b406b1d94f4816b59530d0380fb44069f 100644 (file)
--- a/runit/sv.c
+++ b/runit/sv.c
@@ -207,7 +207,7 @@ struct globals {
 #define tstart       (G.tstart      )
 #define tnow         (G.tnow        )
 #define svstatus     (G.svstatus    )
-#define INIT_G() do { } while (0)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 
 #define str_equal(s,t) (!strcmp((s), (t)))

diff --git a/scripts/generate_BUFSIZ.sh b/scripts/generate_BUFSIZ.sh
index afe9eee1eb0eb9d9d72f29cb10202f75e461cf41..bb073864178022f16d8a8bff0d151ad3e960243c 100755 (executable)
--- a/scripts/generate_BUFSIZ.sh
+++ b/scripts/generate_BUFSIZ.sh
@@ -111,4 +111,6 @@ fi
 
 if test $OLD != $REM; then
        echo "Space in _end[] is $REM bytes. Rerun make to use larger COMMON_BUFSIZE."
+else
+       echo "COMMON_BUFSIZE = $REM bytes"
 fi

diff --git a/selinux/setfiles.c b/selinux/setfiles.c
index 441345ae94b9eba8a423959c1260a1770b249e1b..51a7e63bd741376f7dcb330e9622ba0c761f52a2 100644 (file)
--- a/selinux/setfiles.c
+++ b/selinux/setfiles.c
@@ -80,6 +80,7 @@ struct globals {
 #define G (*(struct globals*)bb_common_bufsiz1)
 void BUG_setfiles_globals_too_big(void);
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        if (sizeof(G) > COMMON_BUFSIZE) \
                BUG_setfiles_globals_too_big(); \
        /* memset(&G, 0, sizeof(G)); - already is */ \

diff --git a/sysklogd/logread.c b/sysklogd/logread.c
index ebd7f8b2c9dc658b25eade1ebeda2d3ee8652877..5b999730aeffbb829ed839f64cc23143b226f88a 100644 (file)
--- a/sysklogd/logread.c
+++ b/sysklogd/logread.c
@@ -73,6 +73,7 @@ struct globals {
 #define SMrdn (G.SMrdn)
 #define shbuf (G.shbuf)
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        memcpy(SMrup, init_sem, sizeof(init_sem)); \
 } while (0)
 

diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index 7473b1855655c0487ece61172d2b12f65d4526e2..37514eb542febe6bc2e07b9d57156a9590c3f0e6 100644 (file)
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -288,6 +288,7 @@ struct globals {
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        IF_NOT_FEATURE_MDEV_CONF(G.cur_rule.maj = -1;) \
        IF_NOT_FEATURE_MDEV_CONF(G.cur_rule.mode = 0660;) \
 } while (0)

diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index f9451792ba39329cad7aea08fe9fb490a16ecf5e..dcb53f0087fbfbf02d6184aebc0284dcce494803 100644 (file)
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -76,6 +76,7 @@ struct swap_header_v1 {
 
 #define NWORDS 129
 #define hdr ((struct swap_header_v1*)bb_common_bufsiz1)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 struct BUG_sizes {
        char swap_header_v1_wrong[sizeof(*hdr)  != (NWORDS * 4) ? -1 : 1];
@@ -93,6 +94,8 @@ int mkswap_main(int argc UNUSED_PARAM, char **argv)
        off_t len;
        const char *label = "";
 
+       INIT_G();
+
        opt_complementary = "-1"; /* at least one param */
        /* TODO: -p PAGESZ, -U UUID */
        getopt32(argv, "L:", &label);

diff --git a/util-linux/more.c b/util-linux/more.c
index 58be3ac3be65ae9a5a82447582990d951a480a33..95cbdd994bb5f894a0a93959b1a66f86e72afdb5 100644 (file)
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -33,10 +33,10 @@ struct globals {
        struct termios new_settings;
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
-#define INIT_G() ((void)0)
 #define initial_settings (G.initial_settings)
 #define new_settings     (G.new_settings    )
 #define cin_fileno       (G.cin_fileno      )
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 #define setTermSettings(fd, argp) \
 do { \

diff --git a/util-linux/mount.c b/util-linux/mount.c
index e5c85feff2ce6635270bbc533ce90edc12d4be0d..244f4fa275ec01fc2bdd7b60e4e6f5c93a7c9ee8 100644 (file)
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -457,7 +457,7 @@ enum { GETMNTENT_BUFSIZE = COMMON_BUFSIZE - offsetof(struct globals, getmntent_b
 #endif
 #define fslist            (G.fslist           )
 #define getmntent_buf     (G.getmntent_buf    )
-#define INIT_G() do { } while (0)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 #if ENABLE_FEATURE_MTAB_SUPPORT
 /*

diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index 43228a6bad66f696bc4f30331915aa4517d723a1..6713852e5164c6ec62ab54b1851d4d020d6ffeda 100644 (file)
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -72,7 +72,7 @@ struct globals {
 #define save_g_flags()    ((void)0)
 #define restore_g_flags() ((void)0)
 #endif
-#define INIT_G() do { } while (0)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 #define do_swapoff   (applet_name[5] == 'f')
 

diff --git a/util-linux/uevent.c b/util-linux/uevent.c
index 58668fa5d5898de663dbd1789284d3533bf09448..b98fe616080a5e05cb59527939dbd6ab9a14f9c0 100644 (file)
--- a/util-linux/uevent.c
+++ b/util-linux/uevent.c
@@ -31,6 +31,7 @@
 #define BUFFER_SIZE 16*1024
 
 #define env ((char **)bb_common_bufsiz1)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 enum {
        MAX_ENV = COMMON_BUFSIZE / sizeof(env[0]) - 1,
 };
@@ -46,6 +47,8 @@ int uevent_main(int argc UNUSED_PARAM, char **argv)
        struct sockaddr_nl sa;
        int fd;
 
+       INIT_G();
+
        argv++;
 
        // Subscribe for UEVENT kernel messages