Merge branch 'busybox' into merge

32 files changed, 149 insertions, 82 deletions

diff --git a/networking/arp.c b/networking/arp.c
index 0099aa534..9381eb53a 100644
--- a/networking/arp.c
+++ b/networking/arp.c
@@ -32,6 +32,7 @@
 //usage:       "\n      -H HWTYPE       Hardware address type"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include "inet_common.h"
 
 #include <arpa/inet.h>
@@ -69,12 +70,13 @@ struct globals {
         const char *device;      /* current device */
         smallint hw_set;         /* flag if hw-type was set (-H) */
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define ap         (G.ap        )
 #define hw         (G.hw        )
 #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 ef205e5e6..6b0de4de2 100644
--- a/networking/arping.c
+++ b/networking/arping.c
@@ -28,6 +28,7 @@
 #include <netpacket/packet.h>
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 /* We don't expect to see 1000+ seconds delay, unsigned is enough */
 #define MONOTONIC_US() ((unsigned)monotonic_us())
@@ -60,7 +61,7 @@ struct globals {
         unsigned brd_recv;
         unsigned req_recv;
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define src        (G.src       )
 #define dst        (G.dst       )
 #define me         (G.me        )
@@ -76,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 8345ae67c..360d1e6be 100644
--- a/networking/ftpd.c
+++ b/networking/ftpd.c
@@ -29,6 +29,7 @@
 //usage:     "\n        DIR     Change root to this directory"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include <syslog.h>
 #include <netinet/tcp.h>
 
@@ -123,8 +124,9 @@ struct globals {
         char msg_ok [(sizeof("NNN " MSG_OK ) + 3) & 0xfffc];
         char msg_err[(sizeof("NNN " MSG_ERR) + 3) & 0xfffc];
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#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 607e82713..0bfe388a8 100644
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -50,6 +50,7 @@
 //usage:        )
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 struct globals {
         const char *user;
@@ -60,7 +61,7 @@ struct globals {
         int do_continue;
         char buf[4]; /* actually [BUFSZ] */
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 enum { BUFSZ = COMMON_BUFSIZE - offsetof(struct globals, buf) };
 #define user           (G.user          )
 #define password       (G.password      )
@@ -70,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/httpd.c b/networking/httpd.c
index ed15fd883..abe83a458 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -125,6 +125,7 @@
 //usage:     "\n        -d STRING       URL decode STRING"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #if ENABLE_PAM
 /* PAM may include <locale.h>. We may need to undefine bbox's stub define: */
 # undef setlocale
@@ -307,7 +308,8 @@ struct globals {
         Htaccess *script_i;     /* config script interpreters */
 #endif
         char *iobuf;            /* [IOBUF_SIZE] */
-#define hdr_buf bb_common_bufsiz1
+#define        hdr_buf bb_common_bufsiz1
+#define sizeof_hdr_buf COMMON_BUFSIZE
         char *hdr_ptr;
         int hdr_cnt;
 #if ENABLE_FEATURE_HTTPD_ERROR_PAGES
@@ -368,6 +370,7 @@ enum {
 # define content_gzip     0
 #endif
 #define INIT_G() do { \
+        setup_common_bufsiz(); \
         SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
         IF_FEATURE_HTTPD_BASIC_AUTH(g_realm = "Web Server Authentication";) \
         IF_FEATURE_HTTPD_RANGES(range_start = -1;) \
@@ -1066,7 +1069,7 @@ static int get_line(void)
         alarm(HEADER_READ_TIMEOUT);
         while (1) {
                 if (hdr_cnt <= 0) {
-                        hdr_cnt = safe_read(STDIN_FILENO, hdr_buf, sizeof(hdr_buf));
+                        hdr_cnt = safe_read(STDIN_FILENO, hdr_buf, sizeof_hdr_buf);
                         if (hdr_cnt <= 0)
                                 break;
                         hdr_ptr = hdr_buf;
@@ -1191,9 +1194,9 @@ static NOINLINE void cgi_io_loop_and_exit(int fromCgi_rd, int toCgi_wr, int post
                         /* We expect data, prev data portion is eaten by CGI
                          * and there *is* data to read from the peer
                          * (POSTDATA) */
-                        //count = post_len > (int)sizeof(hdr_buf) ? (int)sizeof(hdr_buf) : post_len;
+                        //count = post_len > (int)sizeof_hdr_buf ? (int)sizeof_hdr_buf : post_len;
                         //count = safe_read(STDIN_FILENO, hdr_buf, count);
-                        count = safe_read(STDIN_FILENO, hdr_buf, sizeof(hdr_buf));
+                        count = safe_read(STDIN_FILENO, hdr_buf, sizeof_hdr_buf);
                         if (count > 0) {
                                 hdr_cnt = count;
                                 hdr_ptr = hdr_buf;
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 2c6db926f..25b04c9d7 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -44,6 +44,7 @@
 //usage:     "\n        -f      Force de/configuration"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 /* After libbb.h, since it needs sys/types.h on some systems */
 #include <sys/utsname.h>
 #include <fnmatch.h>
@@ -129,8 +130,8 @@ struct globals {
         const char *startup_PATH;
         char *shell;
 } 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 const char keywords_up_down[] ALIGN1 =
diff --git a/networking/inetd.c b/networking/inetd.c
index 4f6673b12..8d44b5198 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -170,6 +170,7 @@
 #include <sys/un.h>
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 #if ENABLE_FEATURE_INETD_RPC
 # if defined(__UCLIBC__) && ! defined(__UCLIBC_HAS_RPC__)
@@ -327,7 +328,7 @@ struct globals {
         /* Used in next_line(), and as scratch read buffer */
         char line[256];          /* _at least_ 256, see LINE_SIZE */
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 enum { LINE_SIZE = COMMON_BUFSIZE - offsetof(struct globals, line) };
 #define rlim_ofile_cur  (G.rlim_ofile_cur )
 #define rlim_ofile      (G.rlim_ofile     )
@@ -349,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/isrv_identd.c b/networking/isrv_identd.c
index 252c8aba9..8a15926e5 100644
--- a/networking/isrv_identd.c
+++ b/networking/isrv_identd.c
@@ -18,6 +18,7 @@
 //usage:     "\n        STRING  Ident answer string (default: nobody)"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include <syslog.h>
 #include "isrv.h"
 
@@ -115,10 +116,12 @@ int fakeidentd_main(int argc UNUSED_PARAM, char **argv)
         unsigned opt;
         int fd;
 
+        setup_common_bufsiz();
+
         opt = getopt32(argv, "fiwb:", &bind_address);
         strcpy(bogouser, "nobody");
         if (argv[optind])
-                strncpy(bogouser, argv[optind], sizeof(bogouser) - 1);
+                strncpy(bogouser, argv[optind], COMMON_BUFSIZE - 1);
 
         /* Daemonize if no -f and no -i and no -w */
         if (!(opt & OPT_fiw))
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
index 5c975d8c5..d9e099607 100644
--- a/networking/libiproute/ipaddress.c
+++ b/networking/libiproute/ipaddress.c
@@ -13,6 +13,7 @@
 #include <net/if_arp.h>
 
 #include "ip_common.h"  /* #include "libbb.h" is inside */
+#include "common_bufsiz.h"
 #include "rt_names.h"
 #include "utils.h"
 
@@ -39,8 +40,8 @@ struct filter_t {
 } FIX_ALIASING;
 typedef struct filter_t filter_t;
 
-#define G_filter (*(filter_t*)&bb_common_bufsiz1)
-
+#define G_filter (*(filter_t*)bb_common_bufsiz1)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 static void print_link_flags(unsigned flags, unsigned mdown)
 {
@@ -744,6 +745,9 @@ int FAST_FUNC do_ipaddr(char **argv)
                 /* 0    1         2      3          4         5       6       7      8 */
                 "add\0""change\0""chg\0""replace\0""delete\0""list\0""show\0""lst\0""flush\0";
         int cmd = 2;
+
+        INIT_G();
+
         if (*argv) {
                 cmd = index_in_substrings(commands, *argv);
                 if (cmd < 0)
diff --git a/networking/libiproute/ipneigh.c b/networking/libiproute/ipneigh.c
index 179505c2d..2a1c20e20 100644
--- a/networking/libiproute/ipneigh.c
+++ b/networking/libiproute/ipneigh.c
@@ -8,6 +8,7 @@
  */
 
 #include "ip_common.h"  /* #include "libbb.h" is inside */
+#include "common_bufsiz.h"
 #include "rt_names.h"
 #include "utils.h"
 #include <linux/neighbour.h>
@@ -40,7 +41,8 @@ struct filter_t {
 } FIX_ALIASING;
 typedef struct filter_t filter_t;
 
-#define G_filter (*(filter_t*)&bb_common_bufsiz1)
+#define G_filter (*(filter_t*)bb_common_bufsiz1)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 static int flush_update(void)
 {
@@ -60,7 +62,7 @@ static unsigned nud_state_a2n(char *arg)
                 "stale\0"     "incomplete\0"  "delay\0"  "probe\0"
                 "failed\0"
                 ;
-        static uint8_t nuds[] = {
+        static uint8_t nuds[] ALIGN1 = {
                 NUD_PERMANENT,NUD_REACHABLE, NUD_NOARP,NUD_NONE,
                 NUD_STALE,    NUD_INCOMPLETE,NUD_DELAY,NUD_PROBE,
                 NUD_FAILED
@@ -338,6 +340,8 @@ int FAST_FUNC do_ipneigh(char **argv)
                 /*0-1*/ "show\0"  "flush\0";
         int command_num;
 
+        INIT_G();
+
         if (!*argv)
                 return ipneigh_list_or_flush(argv, 0);
 
diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
index 82827488f..e674e9a0d 100644
--- a/networking/libiproute/iproute.c
+++ b/networking/libiproute/iproute.c
@@ -11,6 +11,7 @@
  */
 
 #include "ip_common.h"  /* #include "libbb.h" is inside */
+#include "common_bufsiz.h"
 #include "rt_names.h"
 #include "utils.h"
 
@@ -43,7 +44,8 @@ struct filter_t {
 } FIX_ALIASING;
 typedef struct filter_t filter_t;
 
-#define G_filter (*(filter_t*)&bb_common_bufsiz1)
+#define G_filter (*(filter_t*)bb_common_bufsiz1)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 static int flush_update(void)
 {
@@ -902,6 +904,8 @@ int FAST_FUNC do_iproute(char **argv)
         unsigned flags = 0;
         int cmd = RTM_NEWROUTE;
 
+        INIT_G();
+
         if (!*argv)
                 return iproute_list_or_flush(argv, 0);
 
diff --git a/networking/libiproute/libnetlink.c b/networking/libiproute/libnetlink.c
index c7533a4a7..cbb5daf95 100644
--- a/networking/libiproute/libnetlink.c
+++ b/networking/libiproute/libnetlink.c
@@ -71,11 +71,15 @@ int FAST_FUNC rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, in
         struct nlmsghdr nlh;
         struct sockaddr_nl nladdr;
         struct iovec iov[2] = { { &nlh, sizeof(nlh) }, { req, len } };
+        /* Use designated initializers, struct layout is non-portable */
         struct msghdr msg = {
-                (void*)&nladdr, sizeof(nladdr),
-                iov,  2,
-                NULL, 0,
-                0
+                .msg_name = (void*)&nladdr,
+                .msg_namelen = sizeof(nladdr),
+                .msg_iov = iov,
+                .msg_iovlen = 2,
+                .msg_control = NULL,
+                .msg_controllen = 0,
+                .msg_flags = 0
         };
 
         memset(&nladdr, 0, sizeof(nladdr));
@@ -104,12 +108,15 @@ static int rtnl_dump_filter(struct rtnl_handle *rth,
         while (1) {
                 int status;
                 struct nlmsghdr *h;
-
+                /* Use designated initializers, struct layout is non-portable */
                 struct msghdr msg = {
-                        (void*)&nladdr, sizeof(nladdr),
-                        &iov, 1,
-                        NULL, 0,
-                        0
+                        .msg_name = (void*)&nladdr,
+                        .msg_namelen = sizeof(nladdr),
+                        .msg_iov = &iov,
+                        .msg_iovlen = 1,
+                        .msg_control = NULL,
+                        .msg_controllen = 0,
+                        .msg_flags = 0
                 };
 
                 status = recvmsg(rth->fd, &msg, 0);
@@ -211,11 +218,15 @@ int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n,
         struct sockaddr_nl nladdr;
         struct iovec iov = { (void*)n, n->nlmsg_len };
         char   *buf = xmalloc(8*1024); /* avoid big stack buffer */
+        /* Use designated initializers, struct layout is non-portable */
         struct msghdr msg = {
-                (void*)&nladdr, sizeof(nladdr),
-                &iov, 1,
-                NULL, 0,
-                0
+                .msg_name = (void*)&nladdr,
+                .msg_namelen = sizeof(nladdr),
+                .msg_iov = &iov,
+                .msg_iovlen = 1,
+                .msg_control = NULL,
+                .msg_controllen = 0,
+                .msg_flags = 0
         };
 
         memset(&nladdr, 0, sizeof(nladdr));
diff --git a/networking/libiproute/ll_proto.c b/networking/libiproute/ll_proto.c
index da2b53cbf..4c32ae574 100644
--- a/networking/libiproute/ll_proto.c
+++ b/networking/libiproute/ll_proto.c
@@ -84,7 +84,7 @@ ETH_P_IP
 
 /* Keep declarations above and below in sync! */
 
-static const char llproto_names[] =
+static const char llproto_names[] ALIGN1 =
 #define __PF(f,n) #n "\0"
 __PF(LOOP,loop)
 __PF(PUP,pup)
diff --git a/networking/libiproute/ll_types.c b/networking/libiproute/ll_types.c
index bb42e269e..62ee0cc54 100644
--- a/networking/libiproute/ll_types.c
+++ b/networking/libiproute/ll_types.c
@@ -16,7 +16,7 @@
 
 const char* FAST_FUNC ll_type_n2a(int type, char *buf)
 {
-        static const char arphrd_name[] =
+        static const char arphrd_name[] ALIGN1 =
         /* 0,                  */ "generic" "\0"
         /* ARPHRD_LOOPBACK,    */ "loopback" "\0"
         /* ARPHRD_ETHER,       */ "ether" "\0"
@@ -105,7 +105,7 @@ const char* FAST_FUNC ll_type_n2a(int type, char *buf)
 
         /* Keep these arrays in sync! */
 
-        static const uint16_t arphrd_type[] = {
+        static const uint16_t arphrd_type[] ALIGN2 = {
         0,                  /* "generic" "\0" */
         ARPHRD_LOOPBACK,    /* "loopback" "\0" */
         ARPHRD_ETHER,       /* "ether" "\0" */
diff --git a/networking/nc.c b/networking/nc.c
index 2f9e17466..13a9b48a8 100644
--- a/networking/nc.c
+++ b/networking/nc.c
@@ -8,6 +8,7 @@
  */
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 //config:config NC
 //config:       bool "nc"
@@ -238,6 +239,8 @@ int nc_main(int argc, char **argv)
         FD_SET(cfd, &readfds);
         FD_SET(STDIN_FILENO, &readfds);
 
+#define iobuf bb_common_bufsiz1
+        setup_common_bufsiz();
         for (;;) {
                 int fd;
                 int ofd;
@@ -248,11 +251,10 @@ int nc_main(int argc, char **argv)
                 if (select(cfd + 1, &testfds, NULL, NULL, NULL) < 0)
                         bb_perror_msg_and_die("select");
 
-#define iobuf bb_common_bufsiz1
                 fd = STDIN_FILENO;
                 while (1) {
                         if (FD_ISSET(fd, &testfds)) {
-                                nread = safe_read(fd, iobuf, sizeof(iobuf));
+                                nread = safe_read(fd, iobuf, COMMON_BUFSIZE);
                                 if (fd == cfd) {
                                         if (nread < 1)
                                                 exit(EXIT_SUCCESS);
diff --git a/networking/ping.c b/networking/ping.c
index 0eb1ae799..cfe682646 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -28,6 +28,7 @@
 #include <net/if.h>
 #include <netinet/ip_icmp.h>
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 #ifdef __BIONIC__
 /* should be in netinet/ip_icmp.h */
@@ -186,8 +187,8 @@ struct globals {
         char *hostname;
         char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN];
 } 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 void noresp(int ign UNUSED_PARAM)
 {
@@ -378,7 +379,7 @@ struct globals {
         } pingaddr;
         unsigned char rcvd_tbl[MAX_DUP_CHK / 8];
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define if_index     (G.if_index    )
 #define source_lsa   (G.source_lsa  )
 #define str_I        (G.str_I       )
@@ -397,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 14e0c1941..2d1305e32 100644
--- a/networking/slattach.c
+++ b/networking/slattach.c
@@ -27,6 +27,7 @@
 //usage:     "\n        -F      Disable RTS/CTS flow control"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include "libiproute/utils.h" /* invarg_1_to_2() */
 
 struct globals {
@@ -34,11 +35,11 @@ struct globals {
         int saved_disc;
         struct termios saved_state;
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #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 c84c18a67..d0bcbdeaa 100644
--- a/networking/tc.c
+++ b/networking/tc.c
@@ -29,6 +29,7 @@
 //usage:        "filter show [ dev STRING ] [ root | parent CLASSID ]"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 #include "libiproute/utils.h"
 #include "libiproute/ip_common.h"
@@ -63,13 +64,14 @@ struct globals {
         uint32_t filter_prio;
         uint32_t filter_proto;
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define filter_ifindex (G.filter_ifindex)
 #define filter_qdisc (G.filter_qdisc)
 #define filter_parent (G.filter_parent)
 #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 3df6a98d8..31bc70459 100644
--- a/networking/tcpudp.c
+++ b/networking/tcpudp.c
@@ -67,6 +67,7 @@
 //usage:     "\n        -v              Verbose"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 /* Wants <limits.h> etc, thus included after libbb.h: */
 #ifdef __linux__
@@ -91,7 +92,7 @@ struct globals {
         char **env_cur;
         char *env_var[1]; /* actually bigger */
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define verbose      (G.verbose     )
 #define max_per_host (G.max_per_host)
 #define cur_per_host (G.cur_per_host)
@@ -100,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 944cf1bd6..d2daf5c8c 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -39,6 +39,7 @@
 #include <arpa/telnet.h>
 #include <netinet/in.h>
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 #ifdef __BIONIC__
 /* should be in arpa/telnet.h */
@@ -108,8 +109,9 @@ struct globals {
         struct termios termios_def;
         struct termios termios_raw;
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#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 25d05fe7a..13c36aa46 100644
--- a/networking/telnetd.c
+++ b/networking/telnetd.c
@@ -44,6 +44,7 @@
 #define DEBUG 0
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include <syslog.h>
 
 #if DEBUG
@@ -82,8 +83,9 @@ struct globals {
         const char *issuefile;
         int maxfd;
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#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/telnetd.ctrlSQ.patch b/networking/telnetd.ctrlSQ.patch
index 7060e1c6e..bc26d2279 100644
--- a/networking/telnetd.ctrlSQ.patch
+++ b/networking/telnetd.ctrlSQ.patch
@@ -94,9 +94,9 @@ exceptional conditions.
  #endif
 +#ifdef TIOCPKT
 +       int control;
-+       static const char lflow_on[] =
++       static const char lflow_on[] ALIGN1 =
 +           {IAC, SB, TELOPT_LFLOW, LFLOW_ON, IAC, SE};
-+       static const char lflow_off[] =
++       static const char lflow_off[] ALIGN1 =
 +           {IAC, SB, TELOPT_LFLOW, LFLOW_OFF, IAC, SE};
 +# define RESERVED sizeof(lflow_on)
 +#else
diff --git a/networking/tftp.c b/networking/tftp.c
index ad9308e52..e879c4674 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -51,6 +51,7 @@
 //usage:     "\n        -l      Log to syslog (inetd mode requires this)"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include <syslog.h>
 
 #if ENABLE_FEATURE_TFTP_GET || ENABLE_FEATURE_TFTP_PUT
@@ -128,8 +129,9 @@ struct globals {
         bb_progress_t pmt;
 #endif
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
+        setup_common_bufsiz(); \
         BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
 } while (0)
 
@@ -757,7 +759,8 @@ int tftpd_main(int argc UNUSED_PARAM, char **argv)
 {
         len_and_sockaddr *our_lsa;
         len_and_sockaddr *peer_lsa;
-        char *local_file, *mode, *user_opt;
+        char *mode, *user_opt;
+        char *local_file = local_file;
         const char *error_msg;
         int opt, result, opcode;
         IF_FEATURE_TFTP_BLOCKSIZE(int blksize = TFTP_BLKSIZE_DEFAULT;)
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index 496ab11a1..a526494d7 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -9,6 +9,7 @@
 #define UDHCP_COMMON_H 1
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include <netinet/udp.h>
 #include <netinet/ip.h>
 
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index 422254d62..c77669a31 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -930,6 +930,8 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
         int retval;
         fd_set rfds;
 
+        setup_common_bufsiz();
+
         /* Default options */
         IF_FEATURE_UDHCP_PORT(SERVER_PORT6 = 547;)
         IF_FEATURE_UDHCP_PORT(CLIENT_PORT6 = 546;)
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 660b943ce..fc7b6216d 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -109,7 +109,7 @@ enum {
 /*** Script execution code ***/
 
 /* get a rough idea of how long an option will be (rounding up...) */
-static const uint8_t len_of_option_as_string[] = {
+static const uint8_t len_of_option_as_string[] ALIGN1 = {
         [OPTION_IP              ] = sizeof("255.255.255.255 "),
         [OPTION_IP_PAIR         ] = sizeof("255.255.255.255 ") * 2,
         [OPTION_STATIC_ROUTES   ] = sizeof("255.255.255.255/32 255.255.255.255 "),
@@ -1268,6 +1268,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
         int retval;
         fd_set rfds;
 
+        setup_common_bufsiz();
+
         /* Default options */
         IF_FEATURE_UDHCP_PORT(SERVER_PORT = 67;)
         IF_FEATURE_UDHCP_PORT(CLIENT_PORT = 68;)
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index 2671ea3e2..e93a9f1da 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -310,10 +310,10 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
         unsigned arpping_ms;
         IF_FEATURE_UDHCP_PORT(char *str_P;)
 
-#if ENABLE_FEATURE_UDHCP_PORT
-        SERVER_PORT = 67;
-        CLIENT_PORT = 68;
-#endif
+        setup_common_bufsiz();
+
+        IF_FEATURE_UDHCP_PORT(SERVER_PORT = 67;)
+        IF_FEATURE_UDHCP_PORT(CLIENT_PORT = 68;)
 
 #if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
         opt_complementary = "vv";
diff --git a/networking/udhcp/dhcpd.h b/networking/udhcp/dhcpd.h
index 183e7e24c..9dd5bef9e 100644
--- a/networking/udhcp/dhcpd.h
+++ b/networking/udhcp/dhcpd.h
@@ -57,7 +57,7 @@ struct server_config_t {
         struct static_lease *static_leases; /* List of ip/mac pairs to assign static leases */
 } FIX_ALIASING;
 
-#define server_config (*(struct server_config_t*)&bb_common_bufsiz1)
+#define server_config (*(struct server_config_t*)bb_common_bufsiz1)
 /* client_config sits in 2nd half of bb_common_bufsiz1 */
 
 #if ENABLE_FEATURE_UDHCP_PORT
diff --git a/networking/udhcp/dhcprelay.c b/networking/udhcp/dhcprelay.c
index f82ac05b4..f52a0cf88 100644
--- a/networking/udhcp/dhcprelay.c
+++ b/networking/udhcp/dhcprelay.c
@@ -33,7 +33,8 @@ struct xid_item {
         struct xid_item *next;
 } FIX_ALIASING;
 
-#define dhcprelay_xid_list (*(struct xid_item*)&bb_common_bufsiz1)
+#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/udhcp/files.c b/networking/udhcp/files.c
index 7b57c6258..b22425352 100644
--- a/networking/udhcp/files.c
+++ b/networking/udhcp/files.c
@@ -57,33 +57,35 @@ static int FAST_FUNC read_staticlease(const char *const_line, void *arg)
 struct config_keyword {
         const char *keyword;
         int (*handler)(const char *line, void *var) FAST_FUNC;
-        void *var;
+        unsigned ofs;
         const char *def;
 };
 
+#define OFS(field) offsetof(struct server_config_t, field)
+
 static const struct config_keyword keywords[] = {
         /* keyword        handler           variable address               default */
-        {"start"        , udhcp_str2nip   , &server_config.start_ip     , "192.168.0.20"},
-        {"end"          , udhcp_str2nip   , &server_config.end_ip       , "192.168.0.254"},
-        {"interface"    , read_str        , &server_config.interface    , "eth0"},
+        {"start"        , udhcp_str2nip   , OFS(start_ip     ), "192.168.0.20"},
+        {"end"          , udhcp_str2nip   , OFS(end_ip       ), "192.168.0.254"},
+        {"interface"    , read_str        , OFS(interface    ), "eth0"},
         /* Avoid "max_leases value not sane" warning by setting default
          * to default_end_ip - default_start_ip + 1: */
-        {"max_leases"   , read_u32        , &server_config.max_leases   , "235"},
-        {"auto_time"    , read_u32        , &server_config.auto_time    , "7200"},
-        {"decline_time" , read_u32        , &server_config.decline_time , "3600"},
-        {"conflict_time", read_u32        , &server_config.conflict_time, "3600"},
-        {"offer_time"   , read_u32        , &server_config.offer_time   , "60"},
-        {"min_lease"    , read_u32        , &server_config.min_lease_sec, "60"},
-        {"lease_file"   , read_str        , &server_config.lease_file   , LEASES_FILE},
-        {"pidfile"      , read_str        , &server_config.pidfile      , "/var/run/udhcpd.pid"},
-        {"siaddr"       , udhcp_str2nip   , &server_config.siaddr_nip   , "0.0.0.0"},
+        {"max_leases"   , read_u32        , OFS(max_leases   ), "235"},
+        {"auto_time"    , read_u32        , OFS(auto_time    ), "7200"},
+        {"decline_time" , read_u32        , OFS(decline_time ), "3600"},
+        {"conflict_time", read_u32        , OFS(conflict_time), "3600"},
+        {"offer_time"   , read_u32        , OFS(offer_time   ), "60"},
+        {"min_lease"    , read_u32        , OFS(min_lease_sec), "60"},
+        {"lease_file"   , read_str        , OFS(lease_file   ), LEASES_FILE},
+        {"pidfile"      , read_str        , OFS(pidfile      ), "/var/run/udhcpd.pid"},
+        {"siaddr"       , udhcp_str2nip   , OFS(siaddr_nip   ), "0.0.0.0"},
         /* keywords with no defaults must be last! */
-        {"option"       , udhcp_str2optset, &server_config.options      , ""},
-        {"opt"          , udhcp_str2optset, &server_config.options      , ""},
-        {"notify_file"  , read_str        , &server_config.notify_file  , NULL},
-        {"sname"        , read_str        , &server_config.sname        , NULL},
-        {"boot_file"    , read_str        , &server_config.boot_file    , NULL},
-        {"static_lease" , read_staticlease, &server_config.static_leases, ""},
+        {"option"       , udhcp_str2optset, OFS(options      ), ""},
+        {"opt"          , udhcp_str2optset, OFS(options      ), ""},
+        {"notify_file"  , read_str        , OFS(notify_file  ), NULL},
+        {"sname"        , read_str        , OFS(sname        ), NULL},
+        {"boot_file"    , read_str        , OFS(boot_file    ), NULL},
+        {"static_lease" , read_staticlease, OFS(static_leases), ""},
 };
 enum { KWS_WITH_DEFAULTS = ARRAY_SIZE(keywords) - 6 };
 
@@ -95,17 +97,17 @@ void FAST_FUNC read_config(const char *file)
         char *token[2];
 
         for (i = 0; i < KWS_WITH_DEFAULTS; i++)
-                keywords[i].handler(keywords[i].def, keywords[i].var);
+                keywords[i].handler(keywords[i].def, (char*)&server_config + keywords[i].ofs);
 
         parser = config_open(file);
         while (config_read(parser, token, 2, 2, "# \t", PARSE_NORMAL)) {
                 for (k = keywords, i = 0; i < ARRAY_SIZE(keywords); k++, i++) {
                         if (strcasecmp(token[0], k->keyword) == 0) {
-                                if (!k->handler(token[1], k->var)) {
+                                if (!k->handler(token[1], (char*)&server_config + k->ofs)) {
                                         bb_error_msg("can't parse line %u in %s",
                                                         parser->lineno, file);
                                         /* reset back to the default value */
-                                        k->handler(k->def, k->var);
+                                        k->handler(k->def, (char*)&server_config + k->ofs);
                                 }
                                 break;
                         }
diff --git a/networking/wget.c b/networking/wget.c
index 87d3bbd13..c725edb5b 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -146,10 +146,10 @@ struct host_info {
         char       *host;
         int         port;
 };
-static const char P_FTP[] = "ftp";
-static const char P_HTTP[] = "http";
+static const char P_FTP[] ALIGN1 = "ftp";
+static const char P_HTTP[] ALIGN1 = "http";
 #if ENABLE_FEATURE_WGET_OPENSSL || ENABLE_FEATURE_WGET_SSL_HELPER
-static const char P_HTTPS[] = "https";
+static const char P_HTTPS[] ALIGN1 = "https";
 #endif
 
 #if ENABLE_FEATURE_WGET_LONG_OPTIONS
diff --git a/networking/zcip.c b/networking/zcip.c
index c93082619..47f3216a0 100644
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -40,6 +40,7 @@
 //usage:     "\nexits only on I/O errors (link down etc)"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include <netinet/ether.h>
 #include <net/if.h>
 #include <net/if_arp.h>
@@ -90,8 +91,8 @@ struct globals {
         struct ether_addr our_ethaddr;
         uint32_t localnet_ip;
 } 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)
 
 
 /**