5 files changed, 57 insertions, 4 deletions

diff --git a/coreutils/dd.c b/coreutils/dd.c
index 7c1a0c0df..eb9f8885f 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -168,6 +168,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
 #endif
         };
         int exitcode = EXIT_FAILURE;
+        int devzero = 0;
         size_t ibs = 512, obs = 512;
         ssize_t n, w;
         char *ibuf, *obuf;
@@ -285,7 +286,12 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
 #endif
 
         if (infile != NULL)
-                xmove_fd(xopen(infile, O_RDONLY), ifd);
+                if (ENABLE_PLATFORM_MINGW32 && !strcmp(infile, "/dev/zero")) {
+                        flags |= FLAG_NOERROR;
+                        devzero = 1;
+                }
+                else
+                        xmove_fd(xopen(infile, O_RDONLY), ifd);
         else {
                 infile = bb_msg_standard_input;
         }
@@ -312,7 +318,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         } else {
                 outfile = bb_msg_standard_output;
         }
-        if (skip) {
+        if (skip && !devzero) {
                 if (lseek(ifd, skip * ibs, SEEK_CUR) < 0) {
                         while (skip-- > 0) {
                                 n = safe_read(ifd, ibuf, ibs);
@@ -329,7 +335,12 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         }
 
         while (!(flags & FLAG_COUNT) || (G.in_full + G.in_part != count)) {
-                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) {
@@ -383,7 +394,8 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                 if (w < 0) goto out_status;
                 if (w > 0) G.out_part++;
         }
-        if (close(ifd) < 0) {
+
+        if (!devzero && close(ifd) < 0) {
  die_infile:
                 bb_simple_perror_msg_and_die(infile);
         }
diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c
index 1911f5319..1c8b4af1b 100644
--- a/coreutils/dos2unix.c
+++ b/coreutils/dos2unix.c
@@ -41,7 +41,9 @@ static void convert(char *fn, int conv_type)
                 temp_fn = xasprintf("%sXXXXXX", resolved_fn);
                 i = mkstemp(temp_fn);
                 if (i == -1
+#if !ENABLE_PLATFORM_MINGW32
                  || fchmod(i, st.st_mode) == -1
+#endif
                 ) {
                         bb_simple_perror_msg_and_die(temp_fn);
                 }
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 1197f7d71..717b3f493 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -612,7 +612,12 @@ static NOINLINE unsigned list_single(const struct dnode *dn)
         if (all_fmt & LIST_INO)
                 column += printf("%7llu ", (long long) dn->dstat.st_ino);
         if (all_fmt & LIST_BLOCKS)
+#if ENABLE_PLATFORM_MINGW32
+                /* MinGW does not have st_blocks */
+                column += printf("%4"OFF_FMT"u ", (off_t)0);
+#else
                 column += printf("%4"OFF_FMT"u ", (off_t) (dn->dstat.st_blocks >> 1));
+#endif
         if (all_fmt & LIST_MODEBITS)
                 column += printf("%-10s ", (char *) bb_mode_string(dn->dstat.st_mode));
         if (all_fmt & LIST_NLINKS)
@@ -790,6 +795,7 @@ static void showfiles(struct dnode **dn, unsigned nfiles)
 }
 
 
+#if !ENABLE_PLATFORM_MINGW32
 #if ENABLE_DESKTOP
 /* http://www.opengroup.org/onlinepubs/9699919799/utilities/ls.html
  * If any of the -l, -n, -s options is specified, each list
@@ -818,6 +824,7 @@ static off_t calculate_blocks(struct dnode **dn)
         return blocks >> 1;
 }
 #endif
+#endif
 
 
 static struct dnode **list_dir(const char *, unsigned *);
@@ -843,10 +850,12 @@ static void showdirs(struct dnode **dn, int first)
                         printf("%s:\n", (*dn)->fullname);
                 }
                 subdnp = list_dir((*dn)->fullname, &nfiles);
+#if !ENABLE_PLATFORM_MINGW32
 #if ENABLE_DESKTOP
                 if ((all_fmt & STYLE_MASK) == STYLE_LONG)
                         printf("total %"OFF_FMT"u\n", calculate_blocks(subdnp));
 #endif
+#endif
                 if (nfiles > 0) {
                         /* list all files at this level */
                         dnsort(subdnp, nfiles);
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index a9a45c8d3..4c6b64d5e 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -84,6 +84,13 @@ typedef long long llong;
 # define LDBL_DIG DBL_DIG
 #endif
 
+#ifdef __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/test.c b/coreutils/test.c
index 70eac5f6c..fb5778760 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -619,6 +619,29 @@ static int filstat(char *nm, enum token mode)
                 return 0;
         }
 
+#if ENABLE_PLATFORM_MINGW32
+        if (mode == FILEX) {
+                int len = strlen(nm), ret;
+                if (len >= 4 &&
+                    (!strcmp(nm+len-4,".exe") ||
+                     !strcmp(nm+len-4,".com")))
+                        ret = stat(nm, &s);
+                else {
+                        char *exepath;
+                        exepath = malloc(len+5);
+                        memcpy(exepath, nm, len);
+                        memcpy(exepath+len, ".exe", 5);
+                        ret = stat(exepath, &s);
+                        if (ret < 0) {
+                                memcpy(exepath+len, ".exe", 5);
+                                ret = stat(exepath, &s);
+                        }
+                        free(exepath);
+                }
+                return ret >= 0;
+        }
+#endif
+
         if (stat(nm, &s) != 0)
                 return 0;
         if (mode == FILEXIST)