1 files changed, 70 insertions, 8 deletions

diff --git a/coreutils/dd.c b/coreutils/dd.c
index 7a64c3513..f439326fd 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
@@ -301,12 +319,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)
 {
@@ -320,9 +351,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 =
@@ -423,11 +454,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) {
@@ -444,7 +475,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;*/
                 }
@@ -509,7 +540,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;
         }
@@ -529,8 +563,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) {
@@ -544,6 +605,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                                 }
                         }
                 }
+#endif
         } else {
                 outfile = bb_msg_standard_output;
         }