5 files changed, 42 insertions, 5 deletions

diff --git a/coreutils/dd.c b/coreutils/dd.c
index 3d1ba2ee6..8c144cfd2 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -294,6 +294,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;
@@ -420,7 +421,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;
         }
@@ -447,7 +453,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 {
@@ -467,7 +473,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) {
@@ -543,7 +554,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);
         }
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index f13bdfc11..b02fb09bd 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -101,6 +101,13 @@ typedef long long llong;
 # define LDBL_DIG DBL_DIG
 #endif
 
+#if ENABLE_PLATFORM_MINGW32
+/* symbol conflict */
+#define CHAR SIZE_CHAR
+#define SHORT SIZE_SHORT
+#define LONG SIZE_LONG
+#define INT SIZE_INT
+#endif
 enum size_spec {
         NO_SIZE,
         CHAR,
diff --git a/coreutils/stat.c b/coreutils/stat.c
index b918ec62e..109b5258c 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -31,7 +31,6 @@
 //config:       bool "Enable display of filesystem status (-f)"
 //config:       default y
 //config:       depends on STAT
-//config:       select PLATFORM_LINUX # statfs()
 //config:       help
 //config:         Without this, stat will not support the '-f' option to display
 //config:         information about filesystem status.
diff --git a/coreutils/test.c b/coreutils/test.c
index 9e18ee986..df42590e4 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -655,6 +655,21 @@ static int filstat(char *nm, enum token mode)
                 return 0;
         }
 
+#if ENABLE_PLATFORM_MINGW32
+        if (mode == FILEX) {
+                char *p;
+
+                if (file_is_executable(nm)) {
+                        return 1;
+                }
+                else if ((p=file_is_win32_executable(nm))) {
+                        free(p);
+                        return 1;
+                }
+                return 0;
+        }
+#endif
+
         if (stat(nm, &s) != 0)
                 return 0;
         if (mode == FILEXIST)
diff --git a/coreutils/yes.c b/coreutils/yes.c
index 81d875589..ce6a90fc0 100644
--- a/coreutils/yes.c
+++ b/coreutils/yes.c
@@ -40,6 +40,10 @@ int yes_main(int argc UNUSED_PARAM, char **argv)
                 ++argv;
 
         do {
+#if ENABLE_PLATFORM_MINGW32
+                if (ferror(stdout) != 0)
+                        break;
+#endif
                 pp = argv;
                 while (1) {
                         fputs(*pp, stdout);