8 files changed, 18 insertions, 9 deletions

diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index 37fa56827..7473b1855 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -97,6 +97,7 @@
 //usage:       "If /dev/mdev.log file exists, debug log will be appended to it."
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include "xregex.h"
 
 /* "mdev -s" scans /sys/class/xxx, looking for directories which have dev
@@ -285,7 +286,7 @@ struct globals {
         struct rule cur_rule;
         char timestr[sizeof("HH:MM:SS.123456")];
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
         IF_NOT_FEATURE_MDEV_CONF(G.cur_rule.maj = -1;) \
         IF_NOT_FEATURE_MDEV_CONF(G.cur_rule.mode = 0660;) \
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index b5d2c49b6..f9451792b 100644
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -13,6 +13,7 @@
 //usage:     "\n        -L LBL  Label"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 #if ENABLE_SELINUX
 static void mkswap_selinux_setcontext(int fd, const char *path)
diff --git a/util-linux/more.c b/util-linux/more.c
index 359571397..58be3ac3b 100644
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -23,6 +23,7 @@
 //usage:       "$ dmesg | more\n"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 /* Support for FEATURE_USE_TERMIOS */
 
diff --git a/util-linux/mount.c b/util-linux/mount.c
index c428f5827..e5c85feff 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -223,6 +223,7 @@
 #define BB_MS_INVERTED_VALUE (1u << 31)
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #if ENABLE_FEATURE_MOUNT_LABEL
 # include "volume_id.h"
 #else
@@ -447,7 +448,7 @@ struct globals {
         char getmntent_buf[1];
 } FIX_ALIASING;
 enum { GETMNTENT_BUFSIZE = COMMON_BUFSIZE - offsetof(struct globals, getmntent_buf) };
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define nfs_mount_version (G.nfs_mount_version)
 #if ENABLE_FEATURE_MOUNT_VERBOSE
 #define verbose           (G.verbose          )
diff --git a/util-linux/script.c b/util-linux/script.c
index abcd73bff..6195161bc 100644
--- a/util-linux/script.c
+++ b/util-linux/script.c
@@ -23,6 +23,7 @@
 //usage:        )
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 int script_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int script_main(int argc UNUSED_PARAM, char **argv)
@@ -108,7 +109,8 @@ int script_main(int argc UNUSED_PARAM, char **argv)
 
         if (child_pid) {
                 /* parent */
-#define buf bb_common_bufsiz1
+#define        buf bb_common_bufsiz1
+#define sizeof_buf COMMON_BUFSIZE
                 struct pollfd pfd[2];
                 int outfd, count, loop;
                 double oldtime = ENABLE_SCRIPTREPLAY ? time(NULL) : 0;
@@ -134,7 +136,7 @@ int script_main(int argc UNUSED_PARAM, char **argv)
                         }
                         if (pfd[0].revents) {
                                 errno = 0;
-                                count = safe_read(pty, buf, sizeof(buf));
+                                count = safe_read(pty, buf, sizeof_buf);
                                 if (count <= 0 && errno != EAGAIN) {
                                         /* err/eof from pty: exit */
                                         goto restore;
@@ -157,7 +159,7 @@ int script_main(int argc UNUSED_PARAM, char **argv)
                                 }
                         }
                         if (pfd[1].revents) {
-                                count = safe_read(STDIN_FILENO, buf, sizeof(buf));
+                                count = safe_read(STDIN_FILENO, buf, sizeof_buf);
                                 if (count <= 0) {
                                         /* err/eof from stdin: don't read stdin anymore */
                                         pfd[1].revents = 0;
@@ -176,7 +178,7 @@ int script_main(int argc UNUSED_PARAM, char **argv)
                  * (util-linux's script doesn't do this. buggy :) */
                 loop = 999;
                 /* pty is in O_NONBLOCK mode, we exit as soon as buffer is empty */
-                while (--loop && (count = safe_read(pty, buf, sizeof(buf))) > 0) {
+                while (--loop && (count = safe_read(pty, buf, sizeof_buf)) > 0) {
                         full_write(STDOUT_FILENO, buf, count);
                         full_write(outfd, buf, count);
                 }
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index c29dd3071..43228a6ba 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -28,6 +28,7 @@
 //usage:     "\n        -a      Stop swapping on all swap devices"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include <mntent.h>
 #ifndef __BIONIC__
 # include <sys/swap.h>
@@ -62,7 +63,7 @@
 struct globals {
         int flags;
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define g_flags (G.flags)
 #define save_g_flags()    int save_g_flags = g_flags
 #define restore_g_flags() g_flags = save_g_flags
diff --git a/util-linux/uevent.c b/util-linux/uevent.c
index 514a9e934..58668fa5d 100644
--- a/util-linux/uevent.c
+++ b/util-linux/uevent.c
@@ -25,11 +25,12 @@
 //usage:   "\n""        # uevent mdev & mdev -s"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include <linux/netlink.h>
 
 #define BUFFER_SIZE 16*1024
 
-#define env ((char **)&bb_common_bufsiz1)
+#define env ((char **)bb_common_bufsiz1)
 enum {
         MAX_ENV = COMMON_BUFSIZE / sizeof(env[0]) - 1,
 };
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 30bef1686..be0300394 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -34,6 +34,7 @@
 # define MNT_DETACH 0x00000002
 #endif
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 #if defined(__dietlibc__)
 // TODO: This does not belong here.
@@ -102,7 +103,7 @@ int umount_main(int argc UNUSED_PARAM, char **argv)
                 if (opt & OPT_ALL)
                         bb_error_msg_and_die("can't open '%s'", bb_path_mtab_file);
         } else {
-                while (getmntent_r(fp, &me, bb_common_bufsiz1, sizeof(bb_common_bufsiz1))) {
+                while (getmntent_r(fp, &me, bb_common_bufsiz1, COMMON_BUFSIZE)) {
                         /* Match fstype if passed */
                         if (!match_fstype(&me, fstype))
                                 continue;