11 files changed, 112 insertions, 11 deletions

diff --git a/coreutils/dd.c b/coreutils/dd.c
index b5f3cbec5..3054ec6ea 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -91,6 +91,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
@@ -367,11 +370,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) {
@@ -388,7 +391,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;*/
                 }
@@ -444,7 +447,12 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
 #endif
 
         if (infile) {
+#if !ENABLE_PLATFORM_MINGW32
                 xmove_fd(xopen(infile, O_RDONLY), ifd);
+#else
+                xmove_fd(mingw_xopen(infile, O_RDONLY), ifd);
+                update_dev_fd(get_dev_type(infile), ifd);
+#endif
         } else {
                 infile = bb_msg_standard_input;
         }
@@ -500,6 +508,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
 
         while (!(G.flags & FLAG_COUNT) || (G.in_full + G.in_part != count)) {
                 ssize_t n;
+
 #if ENABLE_FEATURE_DD_IBS_OBS
                 if (G.flags & FLAG_FULLBLOCK)
                         n = full_read(ifd, ibuf, ibs);
diff --git a/coreutils/du.c b/coreutils/du.c
index d14d9e4ea..4fd09a8ee 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -131,7 +131,7 @@ static void print(unsigned long long size, const char *filename)
                 size++;
                 size >>= 1;
         }
-        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 1bdfba004..900248103 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 1f24784fd..47fe179dc 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 e5375a61a..3eff5a949 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -492,12 +492,18 @@ static NOINLINE unsigned display_single(const struct dnode *dn)
         /* Do readlink early, so that if it fails, error message
          * does not appear *inside* the "ls -l" line */
         lpath = NULL;
+#if ENABLE_PLATFORM_POSIX || ENABLE_FEATURE_READLINK2
         if (opt & OPT_l)
                 if (S_ISLNK(dn->dn_mode))
                         lpath = xmalloc_readlink_or_warn(dn->fullname);
+#endif
 
         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
 //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));
@@ -651,7 +657,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;
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index 4cae0c529..75e14ef7d 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/shred.c b/coreutils/shred.c
index 8f3d9c5c9..86d4b66b4 100644
--- a/coreutils/shred.c
+++ b/coreutils/shred.c
@@ -38,6 +38,10 @@
 
 #include "libbb.h"
 
+#if ENABLE_PLATFORM_MINGW32
+#define xopen mingw_xopen
+#endif
+
 int shred_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int shred_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -96,8 +100,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/stat.c b/coreutils/stat.c
index b6ab5205b..d9287b34e 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.
@@ -195,6 +194,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") \
@@ -322,6 +322,7 @@ static void FAST_FUNC print_stat(char *pformat, const char m,
                 printfs(pformat, filename);
         } else if (m == 'N') {
                 strcatc(pformat, 's');
+#if ENABLE_PLATFORM_POSIX || ENABLE_FEATURE_READLINK2
                 if (S_ISLNK(statbuf->st_mode)) {
                         char *linkname = xmalloc_readlink_or_warn(filename);
                         if (linkname == NULL)
@@ -331,6 +332,9 @@ static void FAST_FUNC print_stat(char *pformat, const char m,
                 } else {
                         printf(pformat, filename);
                 }
+#else
+                printf(pformat, filename);
+#endif
         } else if (m == 'd') {
                 strcat(pformat, "llu");
                 printf(pformat, (unsigned long long) statbuf->st_dev);
@@ -713,6 +717,7 @@ static bool do_stat(const char *filename, const char *format)
                 gw_ent = getgrgid(statbuf.st_gid);
                 pw_ent = getpwuid(statbuf.st_uid);
 
+#if ENABLE_PLATFORM_POSIX || ENABLE_FEATURE_READLINK2
                 if (S_ISLNK(statbuf.st_mode))
                         linkname = xmalloc_readlink_or_warn(filename);
                 if (linkname) {
@@ -721,6 +726,9 @@ static bool do_stat(const char *filename, const char *format)
                 } else {
                         printf("  File: '%s'\n", filename);
                 }
+#else
+                printf("  File: '%s'\n", filename);
+#endif
 
                 printf("  Size: %-10llu\tBlocks: %-10llu IO Block: %-6lu %s\n"
                        "Device: %llxh/%llud\tInode: %-10llu  Links: %-5lu",
diff --git a/coreutils/sum.c b/coreutils/sum.c
index 16ec44540..a15d1932d 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/timeout.c b/coreutils/timeout.c
index 8b7bc2eaa..258cd276f 100644
--- a/coreutils/timeout.c
+++ b/coreutils/timeout.c
@@ -46,11 +46,27 @@
 
 #include "libbb.h"
 
+#if ENABLE_PLATFORM_MINGW32
+HANDLE child = INVALID_HANDLE_VALUE;
+
+static void kill_child(void)
+{
+        if (child != INVALID_HANDLE_VALUE) {
+                kill_SIGTERM_by_handle(child, 128+SIGTERM);
+        }
+}
+#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;
+#else
+        intptr_t ret;
+        DWORD status = EXIT_SUCCESS;
+#endif
         int parent = 0;
         int timeout;
         pid_t pid;
@@ -59,6 +75,10 @@ int timeout_main(int argc UNUSED_PARAM, char **argv)
 #endif
         const char *opt_s = "TERM";
 
+#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 */
@@ -67,7 +87,11 @@ int timeout_main(int argc UNUSED_PARAM, char **argv)
         /*argv += optind; - no, wait for bb_daemonize_or_rexec! */
 
         signo = get_signum(opt_s);
+#if !ENABLE_PLATFORM_MINGW32
         if (signo < 0)
+#else
+        if (signo != SIGTERM && signo != SIGKILL && signo != 0)
+#endif
                 bb_error_msg_and_die("unknown signal '%s'", opt_s);
 
         if (!argv[optind])
@@ -76,6 +100,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
@@ -129,4 +154,32 @@ int timeout_main(int argc UNUSED_PARAM, char **argv)
         argv[1] = sv2;
 #endif
         BB_EXECVP_or_die(argv);
+#else /* ENABLE_PLATFORM_MINGW32 */
+        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);
+        while (1) {
+                sleep(1);
+                if (signo && --timeout <= 0) {
+                        status = signo == SIGKILL ? 137 : 124;
+                        break;
+                }
+                if (WaitForSingleObject(child, 0) == WAIT_OBJECT_0) {
+                        /* process is gone */
+                        GetExitCodeProcess(child, &status);
+                        goto finish;
+                }
+        }
+
+        pid = (pid_t)GetProcessId(child);
+        kill(pid, signo);
+ finish:
+        CloseHandle(child);
+        child = INVALID_HANDLE_VALUE;
+        return status;
+#endif
 }
diff --git a/coreutils/yes.c b/coreutils/yes.c
index 9a435a761..a51b1ad8e 100644
--- a/coreutils/yes.c
+++ b/coreutils/yes.c
@@ -41,6 +41,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);