diff options
| author | Ron Yorston <rmy@pobox.com> | 2015-03-14 21:08:59 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2015-03-14 21:33:07 +0000 |
| commit | 74ba8c760f3337218cddabaaa0acc4e1f5d6e6c5 (patch) | |
| tree | e630abab8c8c79c9639a24e449558bfbc7d3a52f /coreutils/dd.c | |
| parent | a4f58436b78fe59e57620c6e0301f213ee25f273 (diff) | |
| download | busybox-w32-74ba8c760f3337218cddabaaa0acc4e1f5d6e6c5.tar.gz busybox-w32-74ba8c760f3337218cddabaaa0acc4e1f5d6e6c5.tar.bz2 busybox-w32-74ba8c760f3337218cddabaaa0acc4e1f5d6e6c5.zip | |
Post-merge fixes
Diffstat (limited to 'coreutils/dd.c')
| -rw-r--r-- | coreutils/dd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coreutils/dd.c b/coreutils/dd.c index e2d95931c..a01722040 100644 --- a/coreutils/dd.c +++ b/coreutils/dd.c | |||
| @@ -414,7 +414,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv) | |||
| 414 | 414 | ||
| 415 | if (infile) { | 415 | if (infile) { |
| 416 | if (ENABLE_PLATFORM_MINGW32 && !strcmp(infile, "/dev/zero")) { | 416 | if (ENABLE_PLATFORM_MINGW32 && !strcmp(infile, "/dev/zero")) { |
| 417 | flags |= FLAG_NOERROR; | 417 | G.flags |= FLAG_NOERROR; |
| 418 | devzero = 1; | 418 | devzero = 1; |
| 419 | } else { | 419 | } else { |
| 420 | xmove_fd(xopen(infile, O_RDONLY), ifd); | 420 | xmove_fd(xopen(infile, O_RDONLY), ifd); |