17 files changed, 373 insertions, 21 deletions

diff --git a/coreutils/dd.c b/coreutils/dd.c
index 8bb782781..e6b88acf5 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -59,8 +59,13 @@
 //usage:       "[if=FILE] [of=FILE] [" IF_FEATURE_DD_IBS_OBS("ibs=N obs=N/") "bs=N] [count=N] [skip=N] [seek=N]"
 //usage:        IF_FEATURE_DD_IBS_OBS("\n"
 //usage:       "        [conv=notrunc|noerror|sync|fsync]\n"
+//usage:        IF_NOT_PLATFORM_MINGW32(
 //usage:       "        [iflag=skip_bytes|count_bytes|fullblock|direct] [oflag=seek_bytes|append|direct]"
 //usage:        )
+//usage:        IF_PLATFORM_MINGW32(
+//usage:       "        [iflag=skip_bytes|count_bytes|fullblock] [oflag=seek_bytes|append]"
+//usage:        )
+//usage:        )
 //usage:#define dd_full_usage "\n\n"
 //usage:       "Copy a file with converting and formatting\n"
 //usage:     "\n        if=FILE         Read from FILE instead of stdin"
@@ -84,8 +89,10 @@
 //usage:     "\n        iflag=skip_bytes        skip=N is in bytes"
 //usage:     "\n        iflag=count_bytes       count=N is in bytes"
 //usage:     "\n        oflag=seek_bytes        seek=N is in bytes"
+//usage:        IF_NOT_PLATFORM_MINGW32(
 //usage:     "\n        iflag=direct    O_DIRECT input"
 //usage:     "\n        oflag=direct    O_DIRECT output"
+//usage:        )
 //usage:     "\n        iflag=fullblock Read full blocks"
 //usage:     "\n        oflag=append    Open output in append mode"
 //usage:        )
@@ -94,6 +101,9 @@
 //usage:     "\n        status=none     Suppress all output"
 //usage:        )
 //usage:     "\n"
+//usage:    IF_PLATFORM_MINGW32(
+//usage:     "\nif=/dev/zero and if=/dev/urandom are supported"
+//usage:        )
 //usage:     "\nN may be suffixed by c (1), w (2), b (512), kB (1000), k (1024), MB, M, GB, G"
 //usage:
 //usage:#define dd_example_usage
@@ -104,6 +114,10 @@
 #include "libbb.h"
 #include "common_bufsiz.h"
 
+#if ENABLE_PLATFORM_MINGW32
+# undef O_DIRECT
+#endif
+
 /* This is a NOEXEC applet. Be very careful! */
 
 
@@ -141,13 +155,13 @@ enum {
         FLAG_SKIP_BYTES    = (1 << 5) * ENABLE_FEATURE_DD_IBS_OBS,
         FLAG_COUNT_BYTES   = (1 << 6) * ENABLE_FEATURE_DD_IBS_OBS,
         FLAG_FULLBLOCK     = (1 << 7) * ENABLE_FEATURE_DD_IBS_OBS,
-        FLAG_IDIRECT       = (1 << 8) * ENABLE_FEATURE_DD_IBS_OBS,
+        FLAG_IDIRECT       = (1 << 8) * ENABLE_FEATURE_DD_IBS_OBS * ENABLE_PLATFORM_POSIX,
         /* end of input flags */
         /* start of output flags */
         FLAG_OFLAG_SHIFT   = 9,
         FLAG_SEEK_BYTES    = (1 << 9) * ENABLE_FEATURE_DD_IBS_OBS,
         FLAG_APPEND        = (1 << 10) * ENABLE_FEATURE_DD_IBS_OBS,
-        FLAG_ODIRECT       = (1 << 11) * ENABLE_FEATURE_DD_IBS_OBS,
+        FLAG_ODIRECT       = (1 << 11) * ENABLE_FEATURE_DD_IBS_OBS * ENABLE_PLATFORM_POSIX,
         /* end of output flags */
         FLAG_TWOBUFS       = (1 << 12) * ENABLE_FEATURE_DD_IBS_OBS,
         FLAG_COUNT         = 1 << 13,
@@ -220,7 +234,9 @@ static ssize_t dd_read(void *ibuf, size_t ibs)
         ssize_t n;
 
 #if ENABLE_FEATURE_DD_IBS_OBS
+# if !ENABLE_PLATFORM_MINGW32
  read_again:
+# endif
         if (G.flags & FLAG_FULLBLOCK)
                 n = full_read(ifd, ibuf, ibs);
         else
@@ -240,7 +256,9 @@ static bool write_and_stats(const void *buf, size_t len, size_t obs,
 {
         ssize_t n;
 
+#if !ENABLE_PLATFORM_MINGW32
  IF_FEATURE_DD_IBS_OBS(write_again:)
+#endif
         n = full_write(ofd, buf, len);
 #if ENABLE_FEATURE_DD_IBS_OBS
 # ifdef O_DIRECT
@@ -307,12 +325,25 @@ static int parse_comma_flags(char *val, const char *words, const char *error_in)
 
 static void *alloc_buf(size_t size)
 {
+#if !ENABLE_PLATFORM_MINGW32
         /* Important for "{i,o}flag=direct" - buffers must be page aligned */
         if (size >= bb_getpagesize())
                 return xmmap_anon(size);
+#endif
         return xmalloc(size);
 }
 
+#if ENABLE_PLATFORM_MINGW32
+// Does 'path' refer to a physical drive in the win32 device namespace?
+static int is_drive_path(const char *path)
+{
+        char *s = auto_string(strdup(path));
+
+        bs_to_slash(s);
+        return strncasecmp(s, "//./PhysicalDrive", 17) == 0;
+}
+#endif
+
 int dd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int dd_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -326,9 +357,9 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         static const char conv_words[] ALIGN1 =
                 "notrunc\0""sync\0""noerror\0""fsync\0""swab\0";
         static const char iflag_words[] ALIGN1 =
-                "skip_bytes\0""count_bytes\0""fullblock\0""direct\0";
+                "skip_bytes\0""count_bytes\0""fullblock\0"IF_PLATFORM_POSIX("direct\0");
         static const char oflag_words[] ALIGN1 =
-                "seek_bytes\0append\0""direct\0";
+                "seek_bytes\0append\0"IF_PLATFORM_POSIX("direct\0");
 #endif
 #if ENABLE_FEATURE_DD_STATUS
         static const char status_words[] ALIGN1 =
@@ -429,11 +460,11 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_FEATURE_DD_IBS_OBS
                 if (what == OP_ibs) {
                         /* Must fit into positive ssize_t */
-                        ibs = xatoul_range_sfx(val, 1, ((size_t)-1L)/2, cwbkMG_suffixes);
+                        ibs = xatoul_range_sfx(val, 1, ULONG_MAX/2, cwbkMG_suffixes);
                         /*continue;*/
                 }
                 if (what == OP_obs) {
-                        obs = xatoul_range_sfx(val, 1, ((size_t)-1L)/2, cwbkMG_suffixes);
+                        obs = xatoul_range_sfx(val, 1, ULONG_MAX/2, cwbkMG_suffixes);
                         /*continue;*/
                 }
                 if (what == OP_conv) {
@@ -450,7 +481,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                 }
 #endif
                 if (what == OP_bs) {
-                        ibs = xatoul_range_sfx(val, 1, ((size_t)-1L)/2, cwbkMG_suffixes);
+                        ibs = xatoul_range_sfx(val, 1, ULONG_MAX/2, cwbkMG_suffixes);
                         obs = ibs;
                         /*continue;*/
                 }
@@ -515,7 +546,10 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
 # endif
                 }
 #endif
-                xmove_fd(xopen(infile, iflag), ifd);
+                xmove_fd(MINGW_SPECIAL(xopen)(infile, iflag), ifd);
+#if ENABLE_PLATFORM_MINGW32
+                update_special_fd(get_dev_type(infile), ifd);
+#endif
         } else {
                 infile = bb_msg_standard_input;
         }
@@ -535,8 +569,35 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
 # endif
                 }
 #endif
+#if ENABLE_PLATFORM_MINGW32
+                if (is_drive_path(outfile)) {
+                        // Turn off options not supported by Windows device files.
+                        oflag &= ~(O_CREAT | O_TRUNC);
+                }
+#endif
                 xmove_fd(xopen(outfile, oflag), ofd);
 
+#if ENABLE_PLATFORM_MINGW32
+                {
+                        off_t len = (off_t)seek * ((G.flags & FLAG_SEEK_BYTES) ? 1 : obs);
+                        struct stat st;
+                        int ret = fstat(ofd, &st);
+
+                        if (ret == 0 && !(G.flags & FLAG_APPEND) && len > st.st_size)
+                                make_sparse(ofd, st.st_size, len);
+
+                        if (seek && !(G.flags & FLAG_NOTRUNC)) {
+                                if (ftruncate(ofd, len) < 0) {
+                                        if (ret < 0
+                                         || S_ISREG(st.st_mode)
+                                         || S_ISDIR(st.st_mode)
+                                        ) {
+                                                goto die_outfile;
+                                        }
+                                }
+                        }
+                }
+#else
                 if (seek && !(G.flags & FLAG_NOTRUNC)) {
                         size_t blocksz = (G.flags & FLAG_SEEK_BYTES) ? 1 : obs;
                         if (ftruncate(ofd, seek * blocksz) < 0) {
@@ -550,6 +611,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                                 }
                         }
                 }
+#endif
         } else {
                 outfile = bb_msg_standard_output;
         }
diff --git a/coreutils/du.c b/coreutils/du.c
index 4652b6300..338998fc9 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -137,7 +137,7 @@ static void print(unsigned long long size, const char *filename)
                         size >>= 10;
                 }
         }
-        printf("%llu\t%s\n", size, filename);
+        printf("%"LL_FMT"u\t%s\n", size, filename);
 #endif
 }
 
diff --git a/coreutils/expr.c b/coreutils/expr.c
index 47ebe2fca..3f7e21871 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 90e9ed761..9de5ea8eb 100644
--- a/coreutils/factor.c
+++ b/coreutils/factor.c
@@ -124,7 +124,7 @@ static NOINLINE void print_w(wide_t n)
 {
         unsigned rep = square_count;
         do
-                printf(" %llu", n);
+                printf(" %"LL_FMT"u", n);
         while (--rep != 0);
 }
 static NOINLINE void print_h(half_t n)
@@ -226,7 +226,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);
         square_count = 1;
         factorize(N);
 }
diff --git a/coreutils/id.c b/coreutils/id.c
index a4f178bda..0e1286294 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -112,6 +112,7 @@ static int print_user(uid_t id, const char *prefix)
         return print_common(id, uid2uname(id), prefix);
 }
 
+#if !ENABLE_PLATFORM_MINGW32
 /* On error set *n < 0 and return >= 0
  * If *n is too small, update it and return < 0
  * (ok to trash groups[] in both cases)
@@ -142,6 +143,7 @@ static int get_groups(const char *username, gid_t rgid, gid_t *groups, int *n)
         /* if *n >= 0, return -1 (got new *n), else return 0 (error): */
         return -(*n >= 0);
 }
+#endif
 
 int id_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int id_main(int argc UNUSED_PARAM, char **argv)
@@ -184,16 +186,26 @@ int id_main(int argc UNUSED_PARAM, char **argv)
                 euid = ruid = p->pw_uid;
                 egid = rgid = p->pw_gid;
         } else {
+#if ENABLE_PLATFORM_MINGW32
+                // We don't distinguish real/effective ids on Windows.
+                euid = ruid = getuid();
+                egid = rgid = getegid();
+#else
                 egid = getegid();
                 rgid = getgid();
                 euid = geteuid();
                 ruid = getuid();
+#endif
         }
         /* JUST_ALL_GROUPS ignores -r PRINT_REAL flag even if man page for */
         /* id says: print the real ID instead of the effective ID, with -ugG */
         /* in fact in this case egid is always printed if egid != rgid */
         if (!opt || (opt & JUST_ALL_GROUPS)) {
+#if ENABLE_PLATFORM_MINGW32
+                gid_t groups[1];
+#else
                 gid_t *groups;
+#endif
                 int n;
 
                 if (!opt) {
@@ -210,6 +222,11 @@ int id_main(int argc UNUSED_PARAM, char **argv)
                         if (egid != rgid)
                                 status |= print_group(egid, " ");
                 }
+#if ENABLE_PLATFORM_MINGW32
+                // We only admit to having one group id on Windows.
+                n = 1;
+                groups[0] = rgid;
+#else
                 /* We are supplying largish buffer, trying
                  * to not run get_groups() twice. That might be slow
                  * ("user database in remote SQL server" case) */
@@ -220,6 +237,7 @@ int id_main(int argc UNUSED_PARAM, char **argv)
                         groups = xrealloc(groups, n * sizeof(groups[0]));
                         get_groups(username, rgid, groups, &n);
                 }
+#endif
                 if (n > 0) {
                         /* Print the list */
                         prefix = " groups=";
@@ -234,7 +252,7 @@ int id_main(int argc UNUSED_PARAM, char **argv)
                                 bb_simple_error_msg_and_die("can't get groups");
                         return EXIT_FAILURE;
                 }
-                if (ENABLE_FEATURE_CLEAN_UP)
+                if (ENABLE_FEATURE_CLEAN_UP && !ENABLE_PLATFORM_MINGW32)
                         free(groups);
 #if ENABLE_SELINUX
                 if (is_selinux_enabled()) {
diff --git a/coreutils/ls.c b/coreutils/ls.c
index cc809b797..5d2e96a1e 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -109,8 +109,11 @@
 //usage:#define ls_full_usage "\n\n"
 //usage:       "List directory contents\n"
 //usage:     "\n        -1      One column output"
-//usage:     "\n        -a      Include names starting with ."
+//usage:     "\n        -a      Include names starting with ." IF_PLATFORM_MINGW32(" and hidden files")
 //usage:     "\n        -A      Like -a, but exclude . and .."
+//usage:        IF_PLATFORM_MINGW32(
+//usage:     "\n        -aa,-AA Like -a,-A but omit hidden system files"
+//usage:        )
 ////usage:     "\n      -C      List by columns" - don't show, this is a default anyway
 //usage:     "\n        -x      List by lines"
 //usage:     "\n        -d      List directory names, not contents"
@@ -316,6 +319,9 @@ struct dnode {
         int       dn_rdev_min;
 //      dev_t     dn_dev;
 //      blksize_t dn_blksize;
+#if ENABLE_PLATFORM_MINGW32
+        DWORD     dn_attr;
+#endif
 };
 
 struct globals {
@@ -337,6 +343,10 @@ struct globals {
         /* Do time() just once. Saves one syscall per file for "ls -l" */
         time_t current_time_t;
 #endif
+#if ENABLE_PLATFORM_MINGW32
+        int a_count, A_count;
+# define HIDSYS (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)
+#endif
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
@@ -497,7 +507,11 @@ 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);
+#if !ENABLE_FEATURE_EXTRA_FILE_DATA
+                column += printf("%7"LL_FMT"u ", (long long) dn->dn_ino);
+#else
+                column += printf("%19"LL_FMT"u ", (long long) dn->dn_ino);
+#endif
         if (opt & OPT_s) { /* show allocated blocks */
                 if (opt & OPT_h) {
                         column += printf("%"HUMAN_READABLE_MAX_WIDTH_STR"s ",
@@ -659,7 +673,11 @@ static void display_files(struct dnode **dn, unsigned nfiles)
                 }
                 column_width += 2
                         + ((option_mask32 & OPT_Z) ? 33 : 0) /* context width */
+#if !ENABLE_FEATURE_EXTRA_FILE_DATA
                         + ((option_mask32 & OPT_i) ? 8 : 0) /* inode# width */
+#else
+                        + ((option_mask32 & OPT_i) ? 20 : 0) /* inode# width */
+#endif
                         + ((option_mask32 & OPT_s) ? 5 : 0) /* "alloc block" width */
                 ;
                 ncols = (unsigned)G_terminal_width / column_width;
@@ -740,6 +758,9 @@ static struct dnode *my_stat(const char *fullname, const char *name, int force_f
 
         /* cur->dstat = statbuf: */
         cur->dn_mode   = statbuf.st_mode  ;
+#if ENABLE_PLATFORM_MINGW32
+        cur->dn_attr   = statbuf.st_attr  ;
+#endif
         cur->dn_size   = statbuf.st_size  ;
 #if ENABLE_FEATURE_LS_TIMESTAMPS || ENABLE_FEATURE_LS_SORTFILES
         cur->dn_time   = statbuf.st_mtime ;
@@ -920,6 +941,15 @@ static void sort_and_display_files(struct dnode **dn, unsigned nfiles)
 # define sort_and_display_files(dn, nfiles) display_files(dn, nfiles)
 #endif
 
+#if ENABLE_PLATFORM_MINGW32
+static int hide_file(DWORD attr)
+{
+        return
+                ((attr & FILE_ATTRIBUTE_HIDDEN) && !(option_mask32 & (OPT_a|OPT_A))) ||
+                (((attr & HIDSYS) == HIDSYS) && MAX(G.a_count, G.A_count) > 1);
+}
+#endif
+
 /* Returns NULL-terminated malloced vector of pointers (or NULL) */
 static struct dnode **scan_one_dir(const char *path, unsigned *nfiles_p)
 {
@@ -927,6 +957,9 @@ static struct dnode **scan_one_dir(const char *path, unsigned *nfiles_p)
         struct dirent *entry;
         DIR *dir;
         unsigned i, nfiles;
+#if ENABLE_PLATFORM_MINGW32
+        struct stat statbuf;
+#endif
 
         *nfiles_p = 0;
         dir = warn_opendir(path);
@@ -949,9 +982,29 @@ static struct dnode **scan_one_dir(const char *path, unsigned *nfiles_p)
                                 continue; /* if only -A, skip . and .. but show other dotfiles */
                         }
                 }
+#if ENABLE_PLATFORM_MINGW32
+                if (has_dos_drive_prefix(path) && path[2] == '\0')
+                        fullname = xasprintf("%s%s", path, entry->d_name);
+                else
+#endif
                 fullname = concat_path_file(path, entry->d_name);
+#if ENABLE_PLATFORM_MINGW32
+                /* When showing link targets we must first check the
+                 * attributes of the link itself to see if it's hidden. */
+                if ((option_mask32 & OPT_L) && !lstat(fullname, &statbuf)) {
+                        if (hide_file(statbuf.st_attr)) {
+                                free(fullname);
+                                continue;
+                        }
+                }
+#endif
                 cur = my_stat(fullname, bb_basename(fullname), 0);
+#if !ENABLE_PLATFORM_MINGW32
                 if (!cur) {
+#else
+                if (!cur || hide_file(cur->dn_attr)) {
+                        /* skip invalid or hidden files */
+#endif
                         free(fullname);
                         continue;
                 }
@@ -1060,6 +1113,18 @@ static void scan_and_display_dirs_recur(struct dnode **dn, int first)
         }
 }
 
+#if ENABLE_PLATFORM_MINGW32
+static char *fix_backslash(char *p)
+{
+        const char *flag = getenv("BB_FIX_BACKSLASH");
+        int value = flag ? atoi(flag) : 0;
+
+        if (value == 1)
+                bs_to_slash(p);
+        return p;
+}
+#endif
+
 
 int ls_main(int argc UNUSED_PARAM, char **argv)
 {       /*      ^^^^^^^^^^^^^^^^^ note: if FTPD, argc can be wrong, see ftpd.c */
@@ -1129,9 +1194,11 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
                         IF_FEATURE_LS_TIMESTAMPS(":c-u:u-c") /* mtime/atime */
                         /* -w NUM: */
                         IF_FEATURE_LS_WIDTH(":w+")
+                        IF_PLATFORM_MINGW32(":aa:AA")
                 , ls_longopts
                 IF_FEATURE_LS_WIDTH(, /*-T*/ NULL, /*-w*/ &G_terminal_width)
                 IF_FEATURE_LS_COLOR(, &color_opt)
+                IF_PLATFORM_MINGW32(, &G.a_count, &G.A_count)
         );
 #if 0 /* option bits debug */
         bb_error_msg("opt:0x%08x l:%x H:%x color:%x dirs:%x", opt, OPT_l, OPT_H, OPT_color, OPT_dirs_first);
@@ -1155,6 +1222,11 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
         /* set G_show_color = 1/0 */
         if (ENABLE_FEATURE_LS_COLOR_IS_DEFAULT && !is_TERM_dumb()) {
                 char *p = getenv("LS_COLORS");
+# if ENABLE_PLATFORM_MINGW32
+                /* No colour if unset or empty: https://no-color.org */
+                char *no_c = getenv("NO_COLOR");
+                if (!no_c || no_c[0] == '\0')
+# endif
                 /* LS_COLORS is unset, or (not empty && not "none") ? */
                 if (!p || (p[0] && strcmp(p, "none") != 0)) {
                         if (isatty(STDOUT_FILENO)) {
@@ -1204,6 +1276,12 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
                 option_mask32 |= OPT_dirs_first;
         }
 
+#if ENABLE_FEATURE_EXTRA_FILE_DATA
+        /* Enable accurate link counts for directories */
+        if (opt & OPT_l)
+                count_subdirs(NULL);
+#endif
+
         argv += optind;
         if (!argv[0])
                 *--argv = (char*)".";
@@ -1215,6 +1293,9 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
         dn = NULL;
         nfiles = 0;
         do {
+#if ENABLE_PLATFORM_MINGW32
+                *argv = fix_backslash(*argv);
+#endif
                 cur = my_stat(*argv, *argv,
                         /* follow links on command line unless -l, -i, -s or -F: */
                         !(option_mask32 & (OPT_l|OPT_i|OPT_s|OPT_F))
diff --git a/coreutils/nproc.c b/coreutils/nproc.c
index df63bf57a..44408b5f5 100644
--- a/coreutils/nproc.c
+++ b/coreutils/nproc.c
@@ -28,6 +28,9 @@
 int nproc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int nproc_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
+#if ENABLE_PLATFORM_MINGW32
+        DWORD_PTR affinity, process_affinity, system_affinity;
+#endif
         int count = 0;
 #if ENABLE_LONG_OPTS
         int ignore = 0;
@@ -36,7 +39,10 @@ int nproc_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                         "all\0"    No_argument       "\xff"
                         , &ignore
         );
+#endif
 
+#if !ENABLE_PLATFORM_MINGW32
+#if ENABLE_LONG_OPTS
         if (opts & (1 << 1)) {
                 DIR *cpusd = opendir("/sys/devices/system/cpu");
                 if (cpusd) {
@@ -61,6 +67,17 @@ int nproc_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                 }
                 IF_FEATURE_CLEAN_UP(free(mask);)
         }
+#else /* ENABLE_PLATFORM_MINGW32 */
+        if (GetProcessAffinityMask(GetCurrentProcess(), &process_affinity,
+                                        &system_affinity)) {
+                affinity = IF_LONG_OPTS((opts & (1 << 1)) ? system_affinity :)
+                                                process_affinity;
+                while (affinity) {
+                        count += affinity & 1;
+                        affinity >>= 1;
+                }
+        }
+#endif /* ENABLE_PLATFORM_MINGW32 */
 
         IF_LONG_OPTS(count -= ignore;)
         if (count <= 0)
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index e886a4ed2..641d93503 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -110,6 +110,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/printf.c b/coreutils/printf.c
index 4edcfa9b5..379c00cc6 100644
--- a/coreutils/printf.c
+++ b/coreutils/printf.c
@@ -152,6 +152,71 @@ static double my_xstrtod(const char *arg)
         return result;
 }
 
+#if ENABLE_PLATFORM_MINGW32
+static int buflen = 0;
+static int bufmax = 0;
+static char *buffer = NULL;
+
+static void my_flush(void)
+{
+        if (buffer)
+                full_write(STDOUT_FILENO, buffer, buflen);
+        free(buffer);
+        buffer = NULL;
+        buflen = bufmax = 0;
+}
+
+static void copy_to_buffer(const char *str, int len)
+{
+        char *newbuf;
+
+        if (buflen + len >= bufmax) {
+                bufmax += 256 + len;
+                if ((newbuf = realloc(buffer, bufmax)) == NULL) {
+                        my_flush();
+                        return;
+                }
+                buffer = newbuf;
+        }
+        memcpy(buffer + buflen, str, len);
+        buflen += len;
+
+        if (buflen > 40 && buffer[buflen-1] == '\n')
+                my_flush();
+}
+
+static int my_putchar(int ch)
+{
+        char str[1] = { (char)ch };
+        copy_to_buffer(str, 1);
+        return ch;
+}
+
+static int my_printf(const char *format, ...)
+{
+        va_list list;
+        char *str;
+        int len;
+
+        va_start(list, format);
+        len = vasprintf(&str, format, list);
+        va_end(list);
+
+        if (len >= 0) {
+                copy_to_buffer(str, len);
+                free(str);
+        }
+        return len;
+}
+
+#undef bb_putchar
+#undef putchar
+#undef printf
+#define bb_putchar(c) my_putchar(c)
+#define putchar(c) my_putchar(c)
+#define printf(...) my_printf(__VA_ARGS__)
+#endif
+
 /* Handles %b; return 1 if output is to be short-circuited by \c */
 static int print_esc_string(const char *str)
 {
@@ -444,6 +509,9 @@ int printf_main(int argc UNUSED_PARAM, char **argv)
         do {
                 argv = argv2;
                 argv2 = print_formatted(format, argv, &conv_err);
+#if ENABLE_PLATFORM_MINGW32
+                my_flush();
+#endif
         } while (argv2 > argv && *argv2);
 
         /* coreutils compat (bash doesn't do this):
diff --git a/coreutils/shred.c b/coreutils/shred.c
index 7c0be612a..9e53b4820 100644
--- a/coreutils/shred.c
+++ b/coreutils/shred.c
@@ -60,9 +60,9 @@ int shred_main(int argc UNUSED_PARAM, char **argv)
         opt = getopt32(argv, "^" "fuzn:+vxs:" "\0" "-1"/*min 1 arg*/, &num_iter, &opt_s);
         argv += optind;
 
-        zero_fd = xopen("/dev/zero", O_RDONLY);
+        zero_fd = MINGW_SPECIAL(xopen)("/dev/zero", O_RDONLY);
         if (num_iter != 0)
-                rand_fd = xopen("/dev/urandom", O_RDONLY);
+                rand_fd = MINGW_SPECIAL(xopen)("/dev/urandom", O_RDONLY);
 
         for (;;) {
                 struct stat sb;
@@ -102,8 +102,14 @@ int shred_main(int argc UNUSED_PARAM, char **argv)
                 }
                 if (opt & OPT_u) {
                         ftruncate(fd, 0);
+#if ENABLE_PLATFORM_MINGW32
+                        xclose(fd);
+#endif
                         xunlink(fname);
                 }
+#if ENABLE_PLATFORM_MINGW32
+                else
+#endif
                 xclose(fd);
         }
 
diff --git a/coreutils/shuf.c b/coreutils/shuf.c
index 0d23382a2..bd3f6840c 100644
--- a/coreutils/shuf.c
+++ b/coreutils/shuf.c
@@ -212,7 +212,7 @@ int shuf_main(int argc, char **argv)
                                 printf("%.*s%0*llu%c", pfx_len, pfx, padding_width, lo + (uintptr_t)lines[i], eol);
                         else
 #endif
-                                printf("%llu%c", lo + (uintptr_t)lines[i], eol);
+                                printf("%"LL_FMT"u%c", lo + (uintptr_t)lines[i], eol);
                 } else
                         printf("%s%c", lines[i], eol);
         }
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 2e952f81c..949948203 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -43,7 +43,12 @@
 
 //usage:#define sort_trivial_usage
 //usage:       "[-nru"
+//usage:        IF_NOT_PLATFORM_MINGW32(
 //usage:        IF_FEATURE_SORT_BIG("ghMcszbdfiokt] [-o FILE] [-k START[.OFS][OPTS][,END[.OFS][OPTS]] [-t CHAR")
+//usage:        )
+//usage:        IF_PLATFORM_MINGW32(
+//usage:        IF_FEATURE_SORT_BIG("ghMVcszbdfiokt] [-o FILE] [-k START[.OFS][OPTS][,END[.OFS][OPTS]] [-t CHAR")
+//usage:        )
 //usage:       "] [FILE]..."
 //usage:#define sort_full_usage "\n\n"
 //usage:       "Sort lines of text\n"
diff --git a/coreutils/split.c b/coreutils/split.c
index b6d1b9a7b..8d0e485d4 100644
--- a/coreutils/split.c
+++ b/coreutils/split.c
@@ -78,8 +78,10 @@ static char *next_file(char *old, unsigned suffix_len)
         return old;
 }
 
+#if !ENABLE_PLATFORM_MINGW32
 #define read_buffer bb_common_bufsiz1
 enum { READ_BUFFER_SIZE = COMMON_BUFSIZE - 1 };
+#endif
 
 #define SPLIT_OPT_l (1<<0)
 #define SPLIT_OPT_b (1<<1)
@@ -97,8 +99,12 @@ int split_main(int argc UNUSED_PARAM, char **argv)
         unsigned opt;
         ssize_t bytes_read, to_write;
         char *src;
-
+#if ENABLE_PLATFORM_MINGW32
+        size_t READ_BUFFER_SIZE = 16*1024;
+        char *read_buffer = xmalloc(16*1024);
+#else
         setup_common_bufsiz();
+#endif
 
         opt = getopt32(argv, "^"
                         "l:b:a:+" /* -a N */
diff --git a/coreutils/stat.c b/coreutils/stat.c
index 2c2909e7e..dc20c2356 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -190,6 +190,7 @@ FS_TYPE(0x012FF7B4, "xenix") \
 FS_TYPE(0x012FF7B5, "sysv4") \
 FS_TYPE(0x012FF7B6, "sysv2") \
 FS_TYPE(0x012FF7B7, "coh") \
+IF_PLATFORM_MINGW32(FS_TYPE(0x15013346, "udf")) \
 FS_TYPE(0x00011954, "ufs") \
 FS_TYPE(0x012FD16D, "xia") \
 FS_TYPE(0x5346544e, "ntfs") \
@@ -784,6 +785,10 @@ int stat_main(int argc UNUSED_PARAM, char **argv)
                 selinux_or_die();
         }
 #endif
+#if ENABLE_FEATURE_EXTRA_FILE_DATA
+        /* Enable accurate link counts for directories */
+        count_subdirs(NULL);
+#endif
         ok = 1;
         argv += optind;
         for (i = 0; argv[i]; ++i)
diff --git a/coreutils/sum.c b/coreutils/sum.c
index 78e69acc6..7c7cc6b6b 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"LL_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 b63e33cc0..3d38ead00 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -1022,10 +1022,14 @@ int test_main(int argc, char **argv)
 
         info.euid = -1;
         info.egid = -1;
+#if !ENABLE_PLATFORM_MINGW32
         info.ngroups = 0;
         info.supplementary_array = NULL;
+#endif
         r = test_main2(&info, argc, argv);
+#if !ENABLE_PLATFORM_MINGW32
         free(info.supplementary_array);
+#endif
 
         return r;
 }
diff --git a/coreutils/timeout.c b/coreutils/timeout.c
index 84299a0a5..58f96192b 100644
--- a/coreutils/timeout.c
+++ b/coreutils/timeout.c
@@ -43,10 +43,35 @@
 //usage:#define timeout_full_usage "\n\n"
 //usage:       "Run PROG. Send SIG to it if it is not gone in SECS seconds.\n"
 //usage:       "Default SIG: TERM."
+//usage:       IF_PLATFORM_MINGW32("\n")
 //usage:       "If it still exists in KILL_SECS seconds, send KILL.\n"
 
 #include "libbb.h"
 
+#if ENABLE_PLATFORM_MINGW32
+static HANDLE child = INVALID_HANDLE_VALUE;
+
+static void kill_child(void)
+{
+        if (child != INVALID_HANDLE_VALUE) {
+                pid_t pid = (pid_t)GetProcessId(child);
+                if (pid)
+                        kill(pid, SIGTERM);
+        }
+}
+
+/* Return TRUE if child exits before timeout expires */
+static NOINLINE int timeout_wait(duration_t timeout, HANDLE proc, DWORD *status)
+{
+        DWORD t = (DWORD)(timeout * 1000);
+        if (WaitForSingleObject(proc, t) == WAIT_OBJECT_0) {
+                /* process is gone */
+                GetExitCodeProcess(proc, status);
+                return TRUE;
+        }
+        return FALSE;
+}
+#else
 static NOINLINE int timeout_wait(duration_t timeout, pid_t pid)
 {
         /* Just sleep(HUGE_NUM); kill(parent) may kill wrong process! */
@@ -66,13 +91,19 @@ static NOINLINE int timeout_wait(duration_t timeout, pid_t pid)
         }
         return EXIT_FAILURE;
 }
+#endif
 
 int timeout_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int timeout_main(int argc UNUSED_PARAM, char **argv)
 {
         int signo;
+#if !ENABLE_PLATFORM_MINGW32
         int status;
         int parent = 0;
+#else
+        intptr_t ret;
+        DWORD status = EXIT_SUCCESS;
+#endif
         duration_t timeout;
         duration_t kill_timeout;
         pid_t pid;
@@ -82,15 +113,27 @@ int timeout_main(int argc UNUSED_PARAM, char **argv)
         const char *opt_s = "TERM";
         char *opt_k = NULL;
 
+#if ENABLE_PLATFORM_MINGW32
+        xfunc_error_retval = 125;
+#endif
+
         /* -p option is not documented, it is needed to support NOMMU. */
 
         /* -t SECONDS; -p PARENT_PID */
         /* '+': stop at first non-option */
+#if !ENABLE_PLATFORM_MINGW32
         getopt32(argv, "+s:k:" USE_FOR_NOMMU("p:+"), &opt_s, &opt_k, &parent);
+#else
+        getopt32(argv, "+s:k:", &opt_s, &opt_k);
+#endif
         /*argv += optind; - no, wait for bb_daemonize_or_rexec! */
 
         signo = get_signum(opt_s);
+#if !ENABLE_PLATFORM_MINGW32
         if (signo < 0)
+#else
+        if (!is_valid_signal(signo))
+#endif
                 bb_error_msg_and_die("unknown signal '%s'", opt_s);
 
         kill_timeout = 0;
@@ -103,6 +146,7 @@ int timeout_main(int argc UNUSED_PARAM, char **argv)
         if (!argv[optind]) /* no PROG? */
                 bb_show_usage();
 
+#if !ENABLE_PLATFORM_MINGW32
         /* We want to create a grandchild which will watch
          * and kill the grandparent. Other methods:
          * making parent watch child disrupts parent<->child link
@@ -155,4 +199,33 @@ int timeout_main(int argc UNUSED_PARAM, char **argv)
         argv[1] = sv2;
 #endif
         BB_EXECVP_or_die(argv);
+#else /* ENABLE_PLATFORM_MINGW32 */
+        argv += optind;
+        if ((ret=mingw_spawn_proc((const char **)argv)) == -1) {
+                xfunc_error_retval = errno == EACCES ? 126 : 127;
+                bb_perror_msg_and_die("can't execute '%s'", argv[0]);
+        }
+
+        child = (HANDLE)ret;
+        atexit(kill_child);
+        if (timeout_wait(timeout, child, &status))
+                goto finish;
+        status = signo == SIGKILL ? 137 : 124;
+
+        pid = (pid_t)GetProcessId(child);
+        if (pid) {
+                kill(pid, signo);
+
+                if (kill_timeout > 0) {
+                        if (timeout_wait(kill_timeout, child, &status))
+                                goto finish;
+                        kill(pid, SIGKILL);
+                        status = 137;
+                }
+        }
+ finish:
+        CloseHandle(child);
+        child = INVALID_HANDLE_VALUE;
+        return status;
+#endif
 }