3 files changed, 31 insertions, 0 deletions

diff --git a/util-linux/getopt.c b/util-linux/getopt.c
index 213bfab0b..e61d68982 100644
--- a/util-linux/getopt.c
+++ b/util-linux/getopt.c
@@ -412,6 +412,11 @@ int getopt_main(int argc, char **argv)
                         bb_simple_error_msg_and_die("missing optstring argument");
         }
 
+#if ENABLE_PLATFORM_MINGW32
+        // Mingw-w64 getopt(3) uses __argv[0] in error messages, not the
+        // first element of its argument array.
+        __argv[0] =
+#endif
         argv[n] = name ? name : argv[0];
         return generate_output(argv + n, argc - n, optstr, long_options);
 }
diff --git a/util-linux/more.c b/util-linux/more.c
index bffe6ee5e..0be8e0b9b 100644
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -35,6 +35,9 @@
 //usage:#define more_example_usage
 //usage:       "$ dmesg | more\n"
 
+#if ENABLE_PLATFORM_MINGW32
+#include <conio.h>
+#endif
 #include "libbb.h"
 #include "common_bufsiz.h"
 
@@ -59,6 +62,7 @@ static void tcsetattr_tty_TCSANOW(struct termios *settings)
         tcsetattr(G.tty_fileno, TCSANOW, settings);
 }
 
+#if !ENABLE_PLATFORM_MINGW32
 static void gotsig(int sig UNUSED_PARAM)
 {
         /* bb_putchar_stderr doesn't use stdio buffering,
@@ -67,6 +71,7 @@ static void gotsig(int sig UNUSED_PARAM)
         tcsetattr_tty_TCSANOW(&G.initial_settings);
         _exit_FAILURE();
 }
+#endif
 
 #define CONVERTED_TAB_SIZE 8
 
@@ -96,9 +101,13 @@ int more_main(int argc UNUSED_PARAM, char **argv)
          * is not a tty and turns into cat. This makes sense. */
         if (!isatty(STDOUT_FILENO))
                 return bb_cat(argv);
+#if !ENABLE_PLATFORM_MINGW32
         tty = fopen_for_read(CURRENT_TTY);
         if (!tty)
                 return bb_cat(argv);
+#else
+        tty = stdin;
+#endif
 
         G.tty_fileno = fileno(tty);
 
@@ -153,6 +162,11 @@ int more_main(int argc UNUSED_PARAM, char **argv)
                                  */
                                 for (;;) {
                                         fflush_all();
+#if ENABLE_PLATFORM_MINGW32
+                                        if (!(terminal_mode(FALSE) & VT_INPUT))
+                                                input = _getch();
+                                        else
+#endif
                                         input = getc(tty);
                                         input = tolower(input);
                                         /* Erase the last message */
@@ -167,6 +181,10 @@ int more_main(int argc UNUSED_PARAM, char **argv)
                                          * commands, else we show help msg. */
                                         if (input == ' ' || input == '\n' || input == 'r')
                                                 break;
+#if ENABLE_PLATFORM_MINGW32
+                                        if (input == '\r')
+                                                break;
+#endif
                                         len = printf("(Enter:next line Space:next page Q:quit R:show the rest)");
                                 }
                                 len = 0;
@@ -201,6 +219,10 @@ int more_main(int argc UNUSED_PARAM, char **argv)
                                  * will move us to a new line. */
                                 if (++lines >= G.terminal_height || input == '\n')
                                         please_display_more_prompt = 1;
+#if ENABLE_PLATFORM_MINGW32
+                                if (input == '\r')
+                                        please_display_more_prompt = 1;
+#endif
                                 len = 0;
                         }
                         if (c != '\n' && wrap) {
diff --git a/util-linux/rev.c b/util-linux/rev.c
index aad53722d..9a4b887e4 100644
--- a/util-linux/rev.c
+++ b/util-linux/rev.c
@@ -39,6 +39,10 @@ static void strrev(CHAR_T *s, int len)
                 len--;
                 if (len != 0 && s[len] == '\n')
                         len--;
+#if ENABLE_PLATFORM_MINGW32
+                if (len != 0 && s[len] == '\r')
+                        len--;
+#endif
         }
 
         for (i = 0; i < len; i++, len--) {