1 files changed, 12 insertions, 3 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);