11 files changed, 104 insertions, 5 deletions

diff --git a/coreutils/Config.src b/coreutils/Config.src
index 1843e8b0e..2769aa07d 100644
--- a/coreutils/Config.src
+++ b/coreutils/Config.src
@@ -512,18 +512,21 @@ config SEQ
 config SHA1SUM
         bool "sha1sum"
         default y
+        depends on PLATFORM_POSIX || WIN32_NET
         help
           Compute and check SHA1 message digest
 
 config SHA256SUM
         bool "sha256sum"
         default y
+        depends on PLATFORM_POSIX || WIN32_NET
         help
           Compute and check SHA256 message digest
 
 config SHA512SUM
         bool "sha512sum"
         default y
+        depends on PLATFORM_POSIX || WIN32_NET
         help
           Compute and check SHA512 message digest
 
diff --git a/coreutils/cp.c b/coreutils/cp.c
index 337054d7b..c35dc2872 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -149,8 +149,13 @@ int cp_main(int argc, char **argv)
         last = argv[argc - 1];
         /* If there are only two arguments and...  */
         if (argc == 2) {
+#if ENABLE_PLATFORM_MINGW32
+        /* stat can't be aliased, and MinGW uses lstat anyway */
+                s_flags = cp_mv_stat2(*argv, &source_stat, lstat);
+#else
                 s_flags = cp_mv_stat2(*argv, &source_stat,
                                 (flags & FILEUTILS_DEREFERENCE) ? stat : lstat);
+#endif
                 if (s_flags < 0)
                         return EXIT_FAILURE;
                 d_flags = cp_mv_stat(last, &dest_stat);
diff --git a/coreutils/date.c b/coreutils/date.c
index db1b693aa..497031991 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -291,9 +291,14 @@ int date_main(int argc UNUSED_PARAM, char **argv)
                 maybe_set_utc(opt);
 
                 /* if setting time, set it */
+#if ENABLE_PLATFORM_MINGW32
+                if (opt & OPT_SET)
+                        bb_error_msg_and_die("Setting date is not supported");
+#else
                 if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) {
                         bb_perror_msg("can't set date");
                 }
+#endif
         }
 
         /* Display output */
@@ -321,7 +326,11 @@ int date_main(int argc UNUSED_PARAM, char **argv)
                         i = sizeof("%a, %d %b %Y %H:%M:%S ")-1;
                         goto format_utc;
                 } else { /* default case */
+#if ENABLE_PLATFORM_MINGW32
+                        fmt_dt2str = (char*)"%a %b %d %H:%M:%S %Z %Y";
+#else
                         fmt_dt2str = (char*)"%a %b %e %H:%M:%S %Z %Y";
+#endif
                 }
         }
 #if ENABLE_FEATURE_DATE_NANO
@@ -374,6 +383,10 @@ int date_main(int argc UNUSED_PARAM, char **argv)
                 if (strncmp(fmt_dt2str, "%f", 2) == 0) {
                         fmt_dt2str = (char*)"%Y.%m.%d-%H:%M:%S";
                 }
+#if ENABLE_PLATFORM_MINGW32
+                if (strstr(fmt_dt2str, "%e"))
+                        bb_error_msg_and_die("%%e is not supported by Windows strftime");
+#endif
                 /* Generate output string */
                 strftime(date_buf, sizeof(date_buf), fmt_dt2str, &tm_time);
         }
diff --git a/coreutils/dd.c b/coreutils/dd.c
index 8a2eaed72..e4b53c0af 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -201,6 +201,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;
@@ -318,7 +319,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;
         }
@@ -345,7 +351,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);
@@ -362,7 +368,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) {
@@ -416,7 +427,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 df2376bea..add1da666 100644
--- a/coreutils/dos2unix.c
+++ b/coreutils/dos2unix.c
@@ -60,7 +60,7 @@ static void convert(char *fn, int conv_type)
 
                 temp_fn = xasprintf("%sXXXXXX", resolved_fn);
                 i = xmkstemp(temp_fn);
-                if (fchmod(i, st.st_mode) == -1)
+                if (!ENABLE_PLATFORM_MINGW32 && fchmod(i, st.st_mode) == -1)
                         bb_simple_perror_msg_and_die(temp_fn);
 
                 out = xfdopen_for_write(i);
diff --git a/coreutils/libcoreutils/cp_mv_stat.c b/coreutils/libcoreutils/cp_mv_stat.c
index 5ba07ecc3..1af2ebb71 100644
--- a/coreutils/libcoreutils/cp_mv_stat.c
+++ b/coreutils/libcoreutils/cp_mv_stat.c
@@ -46,5 +46,10 @@ int FAST_FUNC cp_mv_stat2(const char *fn, struct stat *fn_stat, stat_func sf)
 
 int FAST_FUNC cp_mv_stat(const char *fn, struct stat *fn_stat)
 {
+#if ENABLE_PLATFORM_MINGW32
+        /* stat can't be aliased, and MinGW uses lstat anyway */
+        return cp_mv_stat2(fn, fn_stat, lstat);
+#else
         return cp_mv_stat2(fn, fn_stat, stat);
+#endif
 }
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 217321933..09b9f101a 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -684,7 +684,12 @@ static NOINLINE unsigned list_single(const struct dnode *dn)
                 column += printf("%7llu ", (long long) dn->dstat.st_ino);
 //TODO: -h should affect -s too:
         if (all_fmt & LIST_BLOCKS)
+#if ENABLE_PLATFORM_MINGW32
+                /* MinGW does not have st_blocks */
+                column += printf("%6"OFF_FMT"u ", (off_t)0);
+#else
                 column += printf("%6"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)
@@ -867,6 +872,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
@@ -895,6 +901,7 @@ static off_t calculate_blocks(struct dnode **dn)
         return blocks >> 1;
 }
 #endif
+#endif
 
 
 static struct dnode **list_dir(const char *, unsigned *);
@@ -914,10 +921,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 1f5398ad8..2e896f4c7 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -642,6 +642,33 @@ 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) {
+                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)
diff --git a/coreutils/uname.c b/coreutils/uname.c
index 7a86b32a6..775c450df 100644
--- a/coreutils/uname.c
+++ b/coreutils/uname.c
@@ -73,7 +73,11 @@ typedef struct {
         struct utsname name;
         char processor[sizeof(((struct utsname*)NULL)->machine)];
         char platform[sizeof(((struct utsname*)NULL)->machine)];
+#if ENABLE_PLATFORM_MINGW32
+        char os[sizeof("MS/Windows")];
+#else
         char os[sizeof("GNU/Linux")];
+#endif
 } uname_info_t;
 
 static const char options[] ALIGN1 = "snrvmpioa";
@@ -140,7 +144,11 @@ int uname_main(int argc UNUSED_PARAM, char **argv)
 #endif
         strcpy(uname_info.processor, unknown_str);
         strcpy(uname_info.platform, unknown_str);
+#if ENABLE_PLATFORM_MINGW32
+        strcpy(uname_info.os, "MS/Windows");
+#else
         strcpy(uname_info.os, "GNU/Linux");
+#endif
 #if 0
         /* Fedora does something like this */
         strcpy(uname_info.processor, uname_info.name.machine);
diff --git a/coreutils/whoami.c b/coreutils/whoami.c
index 30b17cab3..500e07166 100644
--- a/coreutils/whoami.c
+++ b/coreutils/whoami.c
@@ -21,11 +21,21 @@
 int whoami_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int whoami_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
+#if ENABLE_PLATFORM_MINGW32
+        char buf[64];
+        DWORD len = 64;
+#endif
+
         if (argv[1])
                 bb_show_usage();
 
+#if ENABLE_PLATFORM_MINGW32
+        GetUserName(buf, &len);
+        puts(buf);
+#else
         /* Will complain and die if username not found */
         puts(xuid2uname(geteuid()));
+#endif
 
         return fflush_all();
 }