1 files changed, 16 insertions, 4 deletions

diff --git a/coreutils/dd.c b/coreutils/dd.c
index 43545c010..f7f1c9564 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -293,6 +293,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
 #endif
         };
         smallint exitcode = EXIT_FAILURE;
+        int devzero = 0;
         int i;
         size_t ibs = 512;
         char *ibuf;
@@ -419,7 +420,12 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
 #endif
 
         if (infile) {
-                xmove_fd(xopen(infile, O_RDONLY), ifd);
+                if (ENABLE_PLATFORM_MINGW32 && !strcmp(infile, "/dev/zero")) {
+                        G.flags |= FLAG_NOERROR;
+                        devzero = 1;
+                } else {
+                        xmove_fd(xopen(infile, O_RDONLY), ifd);
+                }
         } else {
                 infile = bb_msg_standard_input;
         }
@@ -446,7 +452,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         } else {
                 outfile = bb_msg_standard_output;
         }
-        if (skip) {
+        if (skip && !devzero) {
                 size_t blocksz = (G.flags & FLAG_SKIP_BYTES) ? 1 : ibs;
                 if (lseek(ifd, skip * blocksz, SEEK_CUR) < 0) {
                         do {
@@ -466,7 +472,12 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         while (!(G.flags & FLAG_COUNT) || (G.in_full + G.in_part != count)) {
                 ssize_t n;
 
-                n = safe_read(ifd, ibuf, ibs);
+                if (devzero) {
+                        memset(ibuf, 0, ibs);
+                        n = ibs;
+                }
+                else
+                        n = safe_read(ifd, ibuf, ibs);
                 if (n == 0)
                         break;
                 if (n < 0) {
@@ -542,7 +553,8 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                 if (write_and_stats(obuf, oc, obs, outfile))
                         goto out_status;
         }
-        if (close(ifd) < 0) {
+
+        if (!devzero && close(ifd) < 0) {
  die_infile:
                 bb_simple_perror_msg_and_die(infile);
         }