Merge branch 'busybox' into merge

1 files changed, 3 insertions, 1 deletions

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';) \