aboutsummaryrefslogtreecommitdiff
path: root/coreutils/dd.c
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2016-05-16 09:33:03 +0100
committerRon Yorston <rmy@pobox.com>2016-05-16 09:33:03 +0100
commit35d2f5bccb0f3dde600702ebcdb5424d4d50be4a (patch)
tree6e0ff0341c69839e268459a199682628bae734ed /coreutils/dd.c
parent248a2600a2f4b442101ad568d1994b908bb28d4b (diff)
parentf2559e5c2b7bd2c5fa0dd8e88d0a931da92a23af (diff)
downloadbusybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.tar.gz
busybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.tar.bz2
busybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'coreutils/dd.c')
-rw-r--r--coreutils/dd.c4
1 files changed, 3 insertions, 1 deletions
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 @@
91//usage: "4+0 records out\n" 91//usage: "4+0 records out\n"
92 92
93#include "libbb.h" 93#include "libbb.h"
94#include "common_bufsiz.h"
94 95
95/* This is a NOEXEC applet. Be very careful! */ 96/* This is a NOEXEC applet. Be very careful! */
96 97
@@ -108,8 +109,9 @@ struct globals {
108#endif 109#endif
109 int flags; 110 int flags;
110} FIX_ALIASING; 111} FIX_ALIASING;
111#define G (*(struct globals*)&bb_common_bufsiz1) 112#define G (*(struct globals*)bb_common_bufsiz1)
112#define INIT_G() do { \ 113#define INIT_G() do { \
114 setup_common_bufsiz(); \
113 /* we have to zero it out because of NOEXEC */ \ 115 /* we have to zero it out because of NOEXEC */ \
114 memset(&G, 0, sizeof(G)); \ 116 memset(&G, 0, sizeof(G)); \
115} while (0) 117} while (0)