5 files changed, 56 insertions, 12 deletions

diff --git a/coreutils/Config.src b/coreutils/Config.src
index 68c717883..2914fc36a 100644
--- a/coreutils/Config.src
+++ b/coreutils/Config.src
@@ -584,7 +584,6 @@ config FEATURE_SPLIT_FANCY
 config STAT
         bool "stat"
         default y
-        select PLATFORM_LINUX # statfs()
         help
           display file or filesystem status.
 
diff --git a/coreutils/dd.c b/coreutils/dd.c
index 2838f6341..db61f665e 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -203,6 +203,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;
@@ -334,7 +335,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")) {
+                        flags |= FLAG_NOERROR;
+                        devzero = 1;
+                } else {
+                        xmove_fd(xopen(infile, O_RDONLY), ifd);
+                }
         } else {
                 infile = bb_msg_standard_input;
         }
@@ -361,7 +367,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) {
                         do {
                                 ssize_t n = safe_read(ifd, ibuf, ibs);
@@ -380,7 +386,12 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         while (!(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) {
@@ -456,7 +467,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 2c26dda16..34ceefb1c 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -100,6 +100,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,
@@ -387,8 +394,8 @@ print_named_ascii(size_t n_bytes, const char *block,
                 " sp"
         };
         // buf[N] pos:  01234 56789
-        char buf[12] = "   x\0 0xx\0";
-        // actually "   x\0 xxx\0", but want to share string with print_ascii.
+        char buf[12] = "   x\0 xxx\0";
+        // share string with print_ascii.
         // [12] because we take three 32bit stack slots anyway, and
         // gcc is too dumb to initialize with constant stores,
         // it copies initializer from rodata. Oh well.
@@ -419,7 +426,7 @@ print_ascii(size_t n_bytes, const char *block,
                 const char *unused_fmt_string UNUSED_PARAM)
 {
         // buf[N] pos:  01234 56789
-        char buf[12] = "   x\0 0xx\0";
+        char buf[12] = "   x\0 xxx\0";
 
         while (n_bytes--) {
                 const char *s;
@@ -458,8 +465,9 @@ print_ascii(size_t n_bytes, const char *block,
                 case '\x7f':
                         s = " 177";
                         break;
-                default: /* c is never larger than 040 */
-                        buf[7] = (c >> 3) + '0';
+                default:
+                        buf[6] = (c >> 6 & 3) + '0';
+                        buf[7] = (c >> 3 & 7) + '0';
                         buf[8] = (c & 7) + '0';
                         s = buf + 5;
                 }
diff --git a/coreutils/test.c b/coreutils/test.c
index 88cc55050..6b16ffeb1 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -642,6 +642,25 @@ static int filstat(char *nm, enum token mode)
                 return 0;
         }
 
+#if ENABLE_PLATFORM_MINGW32
+#undef R_OK
+#define R_OK S_IREAD
+#undef W_OK
+#define W_OK S_IWRITE
+        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/uname.c b/coreutils/uname.c
index 1c6aa5f79..56d985eb0 100644
--- a/coreutils/uname.c
+++ b/coreutils/uname.c
@@ -70,11 +70,17 @@
 /* After libbb.h, since it needs sys/types.h on some systems */
 #include <sys/utsname.h>
 
+#if ENABLE_PLATFORM_MINGW32
+# define OSNAME "MS/Windows"
+#else
+# define OSNAME "GNU/Linux"
+#endif
+
 typedef struct {
         struct utsname name;
         char processor[sizeof(((struct utsname*)NULL)->machine)];
         char platform[sizeof(((struct utsname*)NULL)->machine)];
-        char os[sizeof("GNU/Linux")];
+        char os[sizeof(OSNAME)];
 } uname_info_t;
 
 static const char options[] ALIGN1 = "snrvmpioa";
@@ -141,7 +147,7 @@ int uname_main(int argc UNUSED_PARAM, char **argv)
 #endif
         strcpy(uname_info.processor, unknown_str);
         strcpy(uname_info.platform, unknown_str);
-        strcpy(uname_info.os, "GNU/Linux");
+        strcpy(uname_info.os, OSNAME);
 #if 0
         /* Fedora does something like this */
         strcpy(uname_info.processor, uname_info.name.machine);