f6250a3be
Denis Vlasenko
2007-04-19
Subject
dd: NOEXEC fix dd: correct wrongly capitalized constant
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
coreutils/dd.c+4 -2
| @@ -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; | |