2 files changed, 21 insertions, 0 deletions

diff --git a/findutils/grep.c b/findutils/grep.c
index b9621384e..0336b2927 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -179,6 +179,14 @@ enum {
 #define PRINT_FILES_WITHOUT_MATCHES (option_mask32 & OPT_L)
 #define NUL_DELIMITED               (option_mask32 & OPT_z)
 
+#if ENABLE_PLATFORM_MINGW32
+# define RE_TRANSLATE_TYPE unsigned char*
+# undef ENABLE_EXTRA_COMPAT
+# define ENABLE_EXTRA_COMPAT 0
+# undef IF_EXTRA_COMPAT
+# define IF_EXTRA_COMPAT(x)
+#endif
+
 struct globals {
         int max_matches;
 #if !ENABLE_EXTRA_COMPAT
diff --git a/findutils/xargs.c b/findutils/xargs.c
index 76c4747fe..e0fb369e8 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -65,6 +65,9 @@
 
 //kbuild:lib-$(CONFIG_XARGS) += xargs.o
 
+#if ENABLE_PLATFORM_MINGW32
+#include <conio.h>
+#endif
 #include "libbb.h"
 
 /* This is a NOEXEC applet. Be very careful! */
@@ -403,13 +406,23 @@ static int xargs_ask_confirmation(void)
         FILE *tty_stream;
         int c, savec;
 
+#if !ENABLE_PLATFORM_MINGW32
         tty_stream = xfopen_for_read(CURRENT_TTY);
+#endif
         fputs(" ?...", stderr);
         fflush_all();
+#if !ENABLE_PLATFORM_MINGW32
         c = savec = getc(tty_stream);
         while (c != EOF && c != '\n')
                 c = getc(tty_stream);
         fclose(tty_stream);
+#else
+        c = savec = getche();
+        while (c != EOF && c != '\r')
+                c = getche();
+        fputs("\n", stderr);
+        fflush_all();
+#endif
         return (savec == 'y' || savec == 'Y');
 }
 #else