emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dd: NOEXEC fix

Browse Source 
dd: correct wrongly capitalized constant
This commit is contained in:
Denis Vlasenko 2007-04-19 20:16:14 +00:00
parent d1801a4430
commit f6250a3bee
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
coreutils/dd.c
View File

@ -98,7 +98,7 @@ int dd_main(int argc, char **argv)
OP_conv, OP_conv,
OP_conv_notrunc, OP_conv_notrunc,
OP_conv_sync, OP_conv_sync,
OP_conv_NOERROR, OP_conv_noerror,
#endif #endif
}; };
int flags = TRUNC_FLAG; int flags = TRUNC_FLAG;
@ -109,6 +109,8 @@ int dd_main(int argc, char **argv)
const char *infile = NULL, *outfile = NULL; const char *infile = NULL, *outfile = NULL;
char *ibuf, *obuf; char *ibuf, *obuf;
memset(&G, 0, sizeof(G)); /* because of NOEXEC */
if (ENABLE_FEATURE_DD_SIGNAL_HANDLING) { if (ENABLE_FEATURE_DD_SIGNAL_HANDLING) {
struct sigaction sa; struct sigaction sa;
@ -164,7 +166,7 @@ int dd_main(int argc, char **argv)
flags &= ~TRUNC_FLAG; flags &= ~TRUNC_FLAG;
if (what == OP_conv_sync) if (what == OP_conv_sync)
flags |= SYNC_FLAG; flags |= SYNC_FLAG;
if (what == OP_conv_NOERROR) if (what == OP_conv_noerror)
flags |= NOERROR; flags |= NOERROR;
if (!key) /* no ',' left, so this was the last specifier */ if (!key) /* no ',' left, so this was the last specifier */
break; break;