9 files changed, 48 insertions, 11 deletions

diff --git a/coreutils/dd.c b/coreutils/dd.c
index 630852205..b37615313 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);
         }
diff --git a/coreutils/expr.c b/coreutils/expr.c
index 5d2fbf2f7..639d29a55 100644
--- a/coreutils/expr.c
+++ b/coreutils/expr.c
@@ -84,7 +84,7 @@
 #if ENABLE_EXPR_MATH_SUPPORT_64
 typedef int64_t arith_t;
 
-#define PF_REZ      "ll"
+#define PF_REZ      LL_FMT
 #define PF_REZ_TYPE (long long)
 #define STRTOL(s, e, b) strtoll(s, e, b)
 #else
diff --git a/coreutils/factor.c b/coreutils/factor.c
index 205cdc053..8782d3d1e 100644
--- a/coreutils/factor.c
+++ b/coreutils/factor.c
@@ -161,7 +161,7 @@ static NOINLINE void factorize(wide_t N)
         }
  end:
         if (N > 1)
-                printf(" %llu", N);
+                printf(" %"LL_FMT"u", N);
         bb_putchar('\n');
 }
 
@@ -175,7 +175,7 @@ static void factorize_numstr(const char *numstr)
         N = bb_strtoull(numstr, NULL, 10);
         if (errno)
                 bb_show_usage();
-        printf("%llu:", N);
+        printf("%"LL_FMT"u:", N);
         factorize(N);
 }
 
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 6780057da..61b4409a7 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -496,7 +496,7 @@ static NOINLINE unsigned display_single(const struct dnode *dn)
                         lpath = xmalloc_readlink_or_warn(dn->fullname);
 
         if (opt & OPT_i) /* show inode# */
-                column += printf("%7llu ", (long long) dn->dn_ino);
+                column += printf("%7"LL_FMT"u ", (long long) dn->dn_ino);
 //TODO: -h should affect -s too:
         if (opt & OPT_s) /* show allocated blocks */
                 column += printf("%6"OFF_FMT"u ", (off_t) (dn->dn_blocks >> 1));
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/sum.c b/coreutils/sum.c
index c55293dc9..2a91f963c 100644
--- a/coreutils/sum.c
+++ b/coreutils/sum.c
@@ -82,9 +82,9 @@ static unsigned sum_file(const char *file, unsigned type)
         if (type >= SUM_SYSV) {
                 r = (s & 0xffff) + ((s & 0xffffffff) >> 16);
                 s = (r & 0xffff) + (r >> 16);
-                printf("%u %llu %s\n", s, (total_bytes + 511) / 512, file);
+                printf("%u %"LL_FMT"u %s\n", s, (total_bytes + 511) / 512, file);
         } else
-                printf("%05u %5llu %s\n", s, (total_bytes + 1023) / 1024, file);
+                printf("%05u %5"OFF_FMT"u %s\n", s, (total_bytes + 1023) / 1024, file);
         return 1;
 #undef buf
 }
diff --git a/coreutils/test.c b/coreutils/test.c
index edcf2a2d8..d4f93312a 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -637,6 +637,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);