Merge branch 'busybox' into merge

3 files changed, 9 insertions, 3 deletions

diff --git a/findutils/find.c b/findutils/find.c
index a0d4853de..d71c69782 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -342,6 +342,7 @@
 
 #include <fnmatch.h>
 #include "libbb.h"
+#include "common_bufsiz.h"
 #if ENABLE_FEATURE_FIND_REGEX
 # include "xregex.h"
 #endif
@@ -421,8 +422,9 @@ struct globals {
         recurse_flags_t recurse_flags;
         IF_FEATURE_FIND_EXEC_PLUS(unsigned max_argv_len;)
 } 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); \
         /* 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 5ed3faab2..e956abbb8 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -58,6 +58,7 @@
 //config:         Print the specified number of context lines (-C).
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include "xregex.h"
 
 
@@ -209,8 +210,9 @@ struct globals {
         llist_t *pattern_head;   /* growable list of patterns to match */
         const char *cur_file;    /* the current file we are reading */
 } 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)
 #define max_matches       (G.max_matches         )
diff --git a/findutils/xargs.c b/findutils/xargs.c
index 8b7ab7b6a..eca1185ec 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -69,6 +69,7 @@
 #include <conio.h>
 #endif
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 /* This is a NOEXEC applet. Be very careful! */
 
@@ -103,8 +104,9 @@ struct globals {
         const char *eof_str;
         int idx;
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#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';) \