Merge branch 'busybox' into merge

14 files changed, 44 insertions, 22 deletions

diff --git a/miscutils/adjtimex.c b/miscutils/adjtimex.c
index 534364a69..058aa9a5c 100644
--- a/miscutils/adjtimex.c
+++ b/miscutils/adjtimex.c
@@ -29,7 +29,7 @@
 # include <sys/timex.h>
 #endif
 
-static const uint16_t statlist_bit[] = {
+static const uint16_t statlist_bit[] ALIGN2 = {
         STA_PLL,
         STA_PPSFREQ,
         STA_PPSTIME,
@@ -45,7 +45,7 @@ static const uint16_t statlist_bit[] = {
         STA_CLOCKERR,
         0
 };
-static const char statlist_name[] =
+static const char statlist_name[] ALIGN1 =
         "PLL"       "\0"
         "PPSFREQ"   "\0"
         "PPSTIME"   "\0"
@@ -61,7 +61,7 @@ static const char statlist_name[] =
         "CLOCKERR"
 ;
 
-static const char ret_code_descript[] =
+static const char ret_code_descript[] ALIGN1 =
         "clock synchronized" "\0"
         "insert leap second" "\0"
         "delete leap second" "\0"
diff --git a/miscutils/chat.c b/miscutils/chat.c
index bd2abc24a..6b429f2a6 100644
--- a/miscutils/chat.c
+++ b/miscutils/chat.c
@@ -17,6 +17,7 @@
 //usage:       "chat '' ATZ OK ATD123456 CONNECT '' ogin: pppuser word: ppppass '~'"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 // default timeout: 45 sec
 #define DEFAULT_CHAT_TIMEOUT 45*1000
@@ -285,9 +286,10 @@ int chat_main(int argc UNUSED_PARAM, char **argv)
                             && poll(&pfd, 1, timeout) > 0
                             && (pfd.revents & POLLIN)
                         ) {
-#define buf bb_common_bufsiz1
                                 llist_t *l;
                                 ssize_t delta;
+#define buf bb_common_bufsiz1
+                                setup_common_bufsiz();
 
                                 // read next char from device
                                 if (safe_read(STDIN_FILENO, buf+buf_len, 1) > 0) {
diff --git a/miscutils/conspy.c b/miscutils/conspy.c
index 1a46a4340..f6468c116 100644
--- a/miscutils/conspy.c
+++ b/miscutils/conspy.c
@@ -42,6 +42,7 @@
 //usage:     "\n        -y LINE Starting line"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include <sys/kd.h>
 
 #define ESC "\033"
@@ -363,7 +364,6 @@ int conspy_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int conspy_main(int argc UNUSED_PARAM, char **argv)
 {
         char tty_name[sizeof(DEV_TTY "NN")];
-#define keybuf bb_common_bufsiz1
         struct termios termbuf;
         unsigned opts;
         unsigned ttynum;
@@ -382,6 +382,9 @@ int conspy_main(int argc UNUSED_PARAM, char **argv)
 
         applet_long_options = getopt_longopts;
 #endif
+#define keybuf bb_common_bufsiz1
+        setup_common_bufsiz();
+
         INIT_G();
         strcpy(G.vcsa_name, DEV_VCSA);
 
@@ -513,7 +516,7 @@ int conspy_main(int argc UNUSED_PARAM, char **argv)
                 default:
                         // Read the keys pressed
                         k = keybuf + G.key_count;
-                        bytes_read = read(G.kbd_fd, k, sizeof(keybuf) - G.key_count);
+                        bytes_read = read(G.kbd_fd, k, COMMON_BUFSIZE - G.key_count);
                         if (bytes_read < 0)
                                 goto abort;
 
diff --git a/miscutils/crond.c b/miscutils/crond.c
index eb327f855..f96c96ee7 100644
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -60,6 +60,7 @@
 //usage:     "\n        -c DIR  Cron dir. Default:"CONFIG_FEATURE_CROND_DIR"/crontabs"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include <syslog.h>
 
 /* glibc frees previous setenv'ed value when we do next setenv()
@@ -140,8 +141,9 @@ struct globals {
         char *env_var_logname;
 #endif
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#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 9c74172ba..4d92bc3d0 100644
--- a/miscutils/dc.c
+++ b/miscutils/dc.c
@@ -4,6 +4,7 @@
  */
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include <math.h>
 
 //usage:#define dc_trivial_usage
@@ -47,11 +48,12 @@ struct globals {
         double stack[1];
 } FIX_ALIASING;
 enum { STACK_SIZE = (COMMON_BUFSIZE - offsetof(struct globals, stack)) / sizeof(double) };
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define pointer   (G.pointer   )
 #define base      (G.base      )
 #define stack     (G.stack     )
 #define INIT_G() do { \
+        setup_common_bufsiz(); \
         base = 10; \
 } while (0)
 
diff --git a/miscutils/eject.c b/miscutils/eject.c
index e33d79127..16ae250ff 100644
--- a/miscutils/eject.c
+++ b/miscutils/eject.c
@@ -40,7 +40,7 @@
 #if ENABLE_FEATURE_EJECT_SCSI
 static void eject_scsi(const char *dev)
 {
-        static const char sg_commands[3][6] = {
+        static const char sg_commands[3][6] ALIGN1 = {
                 { ALLOW_MEDIUM_REMOVAL, 0, 0, 0, 0, 0 },
                 { START_STOP, 0, 0, 0, 1, 0 },
                 { START_STOP, 0, 0, 0, 2, 0 }
diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
index 9557c41db..3ddf8a242 100644
--- a/miscutils/fbsplash.c
+++ b/miscutils/fbsplash.c
@@ -34,6 +34,7 @@
 //usage:     "\n                        commands: 'NN' (% for progress bar) or 'exit'"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include <linux/fb.h>
 
 /* If you want logging messages on /tmp/fbsplash.log... */
@@ -373,10 +374,12 @@ static void fb_drawimage(void)
          *   in pure binary by 1 or 2 bytes. (we support only 1 byte)
          */
 #define concat_buf bb_common_bufsiz1
+        setup_common_bufsiz();
+
         read_ptr = concat_buf;
         while (1) {
                 int w, h, max_color_val;
-                int rem = concat_buf + sizeof(concat_buf) - read_ptr;
+                int rem = concat_buf + COMMON_BUFSIZE - read_ptr;
                 if (rem < 2
                  || fgets(read_ptr, rem, theme_file) == NULL
                 ) {
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index 8e201ac35..b4c5876d4 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -63,6 +63,7 @@
 //usage:     "\n        -z      Reread partition table"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 /* must be _after_ libbb.h: */
 #include <linux/hdreg.h>
 #include <sys/mount.h>
@@ -367,7 +368,7 @@ struct globals {
         unsigned char flushcache[4] = { WIN_FLUSHCACHE, 0, 0, 0 };
 #endif
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define get_identity       (G.get_identity           )
 #define get_geom           (G.get_geom               )
 #define do_flush           (G.do_flush               )
@@ -431,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/miscutils/i2c_tools.c b/miscutils/i2c_tools.c
index aa1c7c5cc..57bb72ae7 100644
--- a/miscutils/i2c_tools.c
+++ b/miscutils/i2c_tools.c
@@ -60,6 +60,7 @@
  */
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 #include <linux/i2c.h>
 #include <linux/i2c-dev.h>
diff --git a/miscutils/inotifyd.c b/miscutils/inotifyd.c
index 908d657fd..52db08ada 100644
--- a/miscutils/inotifyd.c
+++ b/miscutils/inotifyd.c
@@ -56,6 +56,7 @@
 //usage:     "\nWhen x event happens for all FILEs, inotifyd exits."
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include <sys/inotify.h>
 
 static const char mask_names[] ALIGN1 =
@@ -161,9 +162,10 @@ int inotifyd_main(int argc, char **argv)
 
                 // read out all pending events
                 // (NB: len must be int, not ssize_t or long!)
-                xioctl(pfd.fd, FIONREAD, &len);
 #define eventbuf bb_common_bufsiz1
-                ie = buf = (len <= sizeof(eventbuf)) ? eventbuf : xmalloc(len);
+                setup_common_bufsiz();
+                xioctl(pfd.fd, FIONREAD, &len);
+                ie = buf = (len <= COMMON_BUFSIZE) ? eventbuf : xmalloc(len);
                 len = full_read(pfd.fd, buf, len);
                 // process events. N.B. events may vary in length
                 while (len > 0) {
diff --git a/miscutils/ionice.c b/miscutils/ionice.c
index bd300605f..0c14256ab 100644
--- a/miscutils/ionice.c
+++ b/miscutils/ionice.c
@@ -41,7 +41,7 @@ enum {
         IOPRIO_CLASS_IDLE
 };
 
-static const char to_prio[] = "none\0realtime\0best-effort\0idle";
+static const char to_prio[] ALIGN1 = "none\0realtime\0best-effort\0idle";
 
 #define IOPRIO_CLASS_SHIFT      13
 
diff --git a/miscutils/less.c b/miscutils/less.c
index cc0e20bc7..248f3e3f5 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -131,6 +131,7 @@
 #endif
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #if ENABLE_FEATURE_LESS_REGEXP
 #include "xregex.h"
 #endif
@@ -445,7 +446,6 @@ static int at_end(void)
  */
 static void read_lines(void)
 {
-#define readbuf bb_common_bufsiz1
         char *current_line, *p;
         int w = width;
         char last_terminated = terminated;
@@ -455,6 +455,9 @@ static void read_lines(void)
         unsigned old_max_fline = max_fline;
 #endif
 
+#define readbuf bb_common_bufsiz1
+        setup_common_bufsiz();
+
         /* (careful: max_fline can be -1) */
         if (max_fline + 1 > MAXLINES)
                 return;
@@ -486,7 +489,7 @@ static void read_lines(void)
                                         time_t t;
 
                                         errno = 0;
-                                        eof_error = safe_read(STDIN_FILENO, readbuf, sizeof(readbuf));
+                                        eof_error = safe_read(STDIN_FILENO, readbuf, COMMON_BUFSIZE);
                                         if (errno != EAGAIN)
                                                 break;
                                         t = time(NULL);
diff --git a/miscutils/microcom.c b/miscutils/microcom.c
index 5e29a1acd..d9e8f9187 100644
--- a/miscutils/microcom.c
+++ b/miscutils/microcom.c
@@ -19,6 +19,7 @@
 //usage:     "\n        -X      Disable special meaning of NUL and Ctrl-X from stdin"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 // set raw tty mode
 static void xget1(int fd, struct termios *t, struct termios *oldt)
@@ -155,10 +156,11 @@ int microcom_main(int argc UNUSED_PARAM, char **argv)
 skip_write: ;
                 }
                 if (pfd[0].revents) {
-#define iobuf bb_common_bufsiz1
                         ssize_t len;
+#define iobuf bb_common_bufsiz1
+                        setup_common_bufsiz();
                         // read from device -> write to stdout
-                        len = safe_read(sfd, iobuf, sizeof(iobuf));
+                        len = safe_read(sfd, iobuf, COMMON_BUFSIZE);
                         if (len > 0)
                                 full_write(STDOUT_FILENO, iobuf, len);
                         else {
diff --git a/miscutils/setserial.c b/miscutils/setserial.c
index dfed3306e..8b5c4a9c7 100644
--- a/miscutils/setserial.c
+++ b/miscutils/setserial.c
@@ -257,7 +257,7 @@ enum print_mode
 #define CTL_CLOSE               (1 << 3)
 #define CTL_NODIE               (1 << 4)
 
-static const char serial_types[] =
+static const char serial_types[] ALIGN1 =
         "unknown\0"             /* 0 */
         "8250\0"                /* 1 */
         "16450\0"               /* 2 */
@@ -288,7 +288,7 @@ static const char serial_types[] =
 # define MAX_SERIAL_TYPE        13
 #endif
 
-static const char commands[] =
+static const char commands[] ALIGN1 =
         "spd_normal\0"
         "spd_hi\0"
         "spd_vhi\0"
@@ -404,8 +404,8 @@ static const uint16_t setbits[CMD_FLAG_LAST + 1] =
         ASYNC_LOW_LATENCY
 };
 
-static const char STR_INFINITE[] = "infinite";
-static const char STR_NONE[] = "none";
+#define STR_INFINITE "infinite"
+#define STR_NONE     "none"
 
 static const char *uart_type(int type)
 {