Merge branch 'busybox' into merge

2 files changed, 6 insertions, 3 deletions

diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c
index 13617c6e1..c671b9252 100644
--- a/debianutils/run_parts.c
+++ b/debianutils/run_parts.c
@@ -89,17 +89,18 @@
 //usage:       "+ shutdown -h +4m"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 struct globals {
         char **names;
         int    cur;
         char  *cmd[2 /* using 1 provokes compiler warning */];
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define names (G.names)
 #define cur   (G.cur  )
 #define cmd   (G.cmd  )
-#define INIT_G() do { } while (0)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 enum { NUM_CMD = (COMMON_BUFSIZE - sizeof(G)) / sizeof(cmd[0]) - 1 };
 
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index d7c730f45..3625ffee8 100644
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -153,6 +153,7 @@ Misc options:
 /* Override ENABLE_FEATURE_PIDFILE */
 #define WANT_PIDFILE 1
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 struct pid_list {
         struct pid_list *next;
@@ -191,7 +192,7 @@ struct globals {
         int user_id;
         smallint signal_nr;
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define userspec          (G.userspec            )
 #define cmdname           (G.cmdname             )
 #define execname          (G.execname            )
@@ -199,6 +200,7 @@ struct globals {
 #define user_id           (G.user_id             )
 #define signal_nr         (G.signal_nr           )
 #define INIT_G() do { \
+        setup_common_bufsiz(); \
         user_id = -1; \
         signal_nr = 15; \
 } while (0)