Merge branch 'busybox' into merge

14 files changed, 47 insertions, 21 deletions

diff --git a/coreutils/catv.c b/coreutils/catv.c
index 6bb73ba63..0e71368a5 100644
--- a/coreutils/catv.c
+++ b/coreutils/catv.c
@@ -19,6 +19,7 @@
 //usage:     "\n        -v      Don't use ^x or M-x escapes"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 #define CATV_OPT_e (1<<0)
 #define CATV_OPT_t (1<<1)
@@ -48,6 +49,9 @@ int catv_main(int argc UNUSED_PARAM, char **argv)
         /* Read from stdin if there's nothing else to do. */
         if (!argv[0])
                 *--argv = (char*)"-";
+
+#define read_buf bb_common_bufsiz1
+        setup_common_bufsiz();
         do {
                 fd = open_or_warn_stdin(*argv);
                 if (fd < 0) {
@@ -57,7 +61,6 @@ int catv_main(int argc UNUSED_PARAM, char **argv)
                 for (;;) {
                         int i, res;
 
-#define read_buf bb_common_bufsiz1
                         res = read(fd, read_buf, COMMON_BUFSIZE);
                         if (res < 0)
                                 retval = EXIT_FAILURE;
diff --git a/coreutils/cksum.c b/coreutils/cksum.c
index ac0b0c319..8a8a39f68 100644
--- a/coreutils/cksum.c
+++ b/coreutils/cksum.c
@@ -13,6 +13,7 @@
 //usage:       "Calculate the CRC32 checksums of FILES"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 /* This is a NOEXEC applet. Be very careful! */
 
@@ -32,6 +33,7 @@ int cksum_main(int argc UNUSED_PARAM, char **argv)
         argv++;
 #endif
 
+        setup_common_bufsiz();
         do {
                 int fd = open_or_warn_stdin(*argv ? *argv : bb_msg_standard_input);
 
@@ -43,7 +45,7 @@ int cksum_main(int argc UNUSED_PARAM, char **argv)
                 length = 0;
 
 #define read_buf bb_common_bufsiz1
-                while ((bytes_read = safe_read(fd, read_buf, sizeof(read_buf))) > 0) {
+                while ((bytes_read = safe_read(fd, read_buf, COMMON_BUFSIZE)) > 0) {
                         length += bytes_read;
                         crc = crc32_block_endian1(crc, read_buf, bytes_read, crc32_table);
                 }
diff --git a/coreutils/date.c b/coreutils/date.c
index 7965775fe..ff3214d85 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -138,6 +138,7 @@
 //usage:       "Wed Apr 12 18:52:41 MDT 2000\n"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #if ENABLE_FEATURE_DATE_NANO
 # include <sys/syscall.h>
 #endif
@@ -368,6 +369,7 @@ int date_main(int argc UNUSED_PARAM, char **argv)
 #endif
 
 #define date_buf bb_common_bufsiz1
+        setup_common_bufsiz();
         if (*fmt_dt2str == '\0') {
                 /* With no format string, just print a blank line */
                 date_buf[0] = '\0';
@@ -377,7 +379,7 @@ int date_main(int argc UNUSED_PARAM, char **argv)
                         fmt_dt2str = (char*)"%Y.%m.%d-%H:%M:%S";
                 }
                 /* Generate output string */
-                strftime(date_buf, sizeof(date_buf), fmt_dt2str, &tm_time);
+                strftime(date_buf, COMMON_BUFSIZE, fmt_dt2str, &tm_time);
         }
         puts(date_buf);
 
diff --git a/coreutils/dd.c b/coreutils/dd.c
index 7bd3e2084..00139773e 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -91,6 +91,7 @@
 //usage:       "4+0 records out\n"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 /* This is a NOEXEC applet. Be very careful! */
 
@@ -108,8 +109,9 @@ struct globals {
 #endif
         int flags;
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#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 1889c16bb..1240bcbbc 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -58,6 +58,7 @@
 //usage:       "2417    .\n"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 enum {
         OPT_a_files_too    = (1 << 0),
@@ -85,8 +86,8 @@ struct globals {
         int du_depth;
         dev_t dir_dev;
 } 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 print(unsigned long long size, const char *filename)
diff --git a/coreutils/expr.c b/coreutils/expr.c
index c986f9327..ce6b2d189 100644
--- a/coreutils/expr.c
+++ b/coreutils/expr.c
@@ -61,6 +61,7 @@
 //usage:       "of characters matched or 0."
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include "xregex.h"
 
 #if ENABLE_EXPR_MATH_SUPPORT_64
@@ -99,8 +100,8 @@ typedef struct valinfo VALUE;
 struct globals {
         char **args;
 } 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)
 
 /* forward declarations */
 static VALUE *eval(void);
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 20bd61860..344b4e61e 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -93,6 +93,7 @@
 //usage:        )
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include "unicode.h"
 
 
@@ -365,8 +366,9 @@ struct globals {
         time_t current_time_t;
 #endif
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#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 3e0423a3d..a5b3e99f7 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -20,6 +20,7 @@
 
 
 /* #include "libbb.h" - done in od.c */
+#include "common_bufsiz.h"
 #define assert(a) ((void)0)
 
 
@@ -221,8 +222,9 @@ struct globals {
 #if !ENABLE_LONG_OPTS
 enum { G_pseudo_offset = 0 };
 #endif
-#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); \
         G.bytes_per_block = 32; \
 } while (0)
diff --git a/coreutils/split.c b/coreutils/split.c
index 1e1673efb..e67c3de66 100644
--- a/coreutils/split.c
+++ b/coreutils/split.c
@@ -22,6 +22,7 @@
 //usage:       "$ cat TODO | split -a 2 -l 2 TODO_\n"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 #if ENABLE_FEATURE_SPLIT_FANCY
 static const struct suffix_mult split_suffixes[] = {
@@ -78,6 +79,8 @@ int split_main(int argc UNUSED_PARAM, char **argv)
         ssize_t bytes_read, to_write;
         char *src;
 
+        setup_common_bufsiz();
+
         opt_complementary = "?2:a+"; /* max 2 args; -a N */
         opt = getopt32(argv, "l:b:a:", &count_p, &count_p, &suffix_len);
 
diff --git a/coreutils/stat.c b/coreutils/stat.c
index be2723d13..f608045d7 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -102,6 +102,7 @@
 //usage:        )
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 enum {
         OPT_TERSE       = (1 << 0),
@@ -157,8 +158,8 @@ static const char *human_time(time_t t)
 
         /*static char buf[sizeof("YYYY-MM-DD HH:MM:SS.000000000")] ALIGN1;*/
 #define buf bb_common_bufsiz1
-
-        strcpy(strftime_YYYYMMDDHHMMSS(buf, sizeof(buf), &t), ".000000000");
+        setup_common_bufsiz();
+        strcpy(strftime_YYYYMMDDHHMMSS(buf, COMMON_BUFSIZE, &t), ".000000000");
         return buf;
 #undef buf
 }
diff --git a/coreutils/stty.c b/coreutils/stty.c
index b63b0b91a..52967ea8f 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -32,6 +32,7 @@
 //usage:     "\n        [SETTING]       See manpage"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 #ifndef _POSIX_VDISABLE
 # define _POSIX_VDISABLE ((unsigned char) 0)
@@ -317,7 +318,7 @@ enum {
 #define MI_ENTRY(N,T,F,B,M) N "\0"
 
 /* Mode names given on command line */
-static const char mode_name[] =
+static const char mode_name[] ALIGN1 =
         MI_ENTRY("evenp",    combination, REV        | OMIT, 0,          0 )
         MI_ENTRY("parity",   combination, REV        | OMIT, 0,          0 )
         MI_ENTRY("oddp",     combination, REV        | OMIT, 0,          0 )
@@ -680,7 +681,7 @@ enum {
 #define CI_ENTRY(n,s,o) n "\0"
 
 /* Name given on command line */
-static const char control_name[] =
+static const char control_name[] ALIGN1 =
         CI_ENTRY("intr",     CINTR,   VINTR   )
         CI_ENTRY("quit",     CQUIT,   VQUIT   )
         CI_ENTRY("erase",    CERASE,  VERASE  )
@@ -722,7 +723,7 @@ static const char control_name[] =
 #undef CI_ENTRY
 #define CI_ENTRY(n,s,o) { s, o },
 
-static const struct control_info control_info[] = {
+static const struct control_info control_info[] ALIGN2 = {
         /* This should be verbatim cut-n-paste copy of the above CI_ENTRYs */
         CI_ENTRY("intr",     CINTR,   VINTR   )
         CI_ENTRY("quit",     CQUIT,   VQUIT   )
@@ -775,7 +776,7 @@ struct globals {
         unsigned current_col;
         char buf[10];
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
         G.device_name = bb_msg_standard_input; \
         G.max_col = 80; \
diff --git a/coreutils/sum.c b/coreutils/sum.c
index deb068e10..ec9ed2a11 100644
--- a/coreutils/sum.c
+++ b/coreutils/sum.c
@@ -21,6 +21,7 @@
 //usage:     "\n        -s      Use System V sum algorithm (512byte blocks)"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 enum { SUM_BSD, PRINT_NAME, SUM_SYSV };
 
@@ -30,18 +31,20 @@ enum { SUM_BSD, PRINT_NAME, SUM_SYSV };
 /* Return 1 if successful.  */
 static unsigned sum_file(const char *file, unsigned type)
 {
-#define buf bb_common_bufsiz1
         unsigned long long total_bytes = 0;
         int fd, r;
         /* The sum of all the input bytes, modulo (UINT_MAX + 1).  */
         unsigned s = 0;
 
+#define buf bb_common_bufsiz1
+        setup_common_bufsiz();
+
         fd = open_or_warn_stdin(file);
         if (fd == -1)
                 return 0;
 
         while (1) {
-                size_t bytes_read = safe_read(fd, buf, BUFSIZ);
+                size_t bytes_read = safe_read(fd, buf, COMMON_BUFSIZE);
 
                 if ((ssize_t)bytes_read <= 0) {
                         r = (fd && close(fd) != 0);
diff --git a/coreutils/tail.c b/coreutils/tail.c
index e352ab627..39f87679e 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -49,13 +49,14 @@
 //usage:       "nameserver 10.0.0.1\n"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 struct globals {
         bool from_top;
         bool exitcode;
 } 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 tail_xprint_header(const char *fmt, const char *filename)
 {
diff --git a/coreutils/tee.c b/coreutils/tee.c
index 48cc0508f..a68e9446f 100644
--- a/coreutils/tee.c
+++ b/coreutils/tee.c
@@ -23,6 +23,7 @@
 //usage:       "Hello\n"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 int tee_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int tee_main(int argc, char **argv)
@@ -37,6 +38,7 @@ int tee_main(int argc, char **argv)
 #if ENABLE_FEATURE_TEE_USE_BLOCK_IO
         ssize_t c;
 # define buf bb_common_bufsiz1
+        setup_common_bufsiz();
 #else
         int c;
 #endif
@@ -79,7 +81,7 @@ int tee_main(int argc, char **argv)
         /* names[0] will be filled later */
 
 #if ENABLE_FEATURE_TEE_USE_BLOCK_IO
-        while ((c = safe_read(STDIN_FILENO, buf, sizeof(buf))) > 0) {
+        while ((c = safe_read(STDIN_FILENO, buf, COMMON_BUFSIZE)) > 0) {
                 fp = files;
                 do
                         fwrite(buf, 1, c, *fp);