summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko2007-04-19 20:16:14 +0000
committerDenis Vlasenko2007-04-19 20:16:14 +0000
commitf6250a3bee833db83e8a9ade62dce4e85830b6f7 (patch)
treeadd808579830b459bb559b421126338e2e6dcdd4
parentd1801a44301ae10910763de860614b1aed9922d7 (diff)
downloadbusybox-f6250a3bee833db83e8a9ade62dce4e85830b6f7.zip
busybox-f6250a3bee833db83e8a9ade62dce4e85830b6f7.tar.gz
dd: NOEXEC fix
dd: correct wrongly capitalized constant
-rw-r--r--coreutils/dd.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/coreutils/dd.c b/coreutils/dd.c
index 797aabd..5aee9db 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -98,7 +98,7 @@ int dd_main(int argc, char **argv)
OP_conv,
OP_conv_notrunc,
OP_conv_sync,
- OP_conv_NOERROR,
+ OP_conv_noerror,
#endif
};
int flags = TRUNC_FLAG;
@@ -109,6 +109,8 @@ int dd_main(int argc, char **argv)
const char *infile = NULL, *outfile = NULL;
char *ibuf, *obuf;
+ memset(&G, 0, sizeof(G)); /* because of NOEXEC */
+
if (ENABLE_FEATURE_DD_SIGNAL_HANDLING) {
struct sigaction sa;
@@ -164,7 +166,7 @@ int dd_main(int argc, char **argv)
flags &= ~TRUNC_FLAG;
if (what == OP_conv_sync)
flags |= SYNC_FLAG;
- if (what == OP_conv_NOERROR)
+ if (what == OP_conv_noerror)
flags |= NOERROR;
if (!key) /* no ',' left, so this was the last specifier */
break;