2 files changed, 26 insertions, 3 deletions

diff --git a/util-linux/more.c b/util-linux/more.c
index 934b30f8a..d04c17f90 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"
 
@@ -100,9 +103,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
         cin = fopen_for_read(CURRENT_TTY);
         if (!cin)
                 return bb_cat(argv);
+#else
+        cin = stdin;
+#endif
 
         if (ENABLE_FEATURE_USE_TERMIOS) {
                 cin_fileno = fileno(cin);
@@ -158,7 +165,11 @@ int more_main(int argc UNUSED_PARAM, char **argv)
                                  * to get input from the user.
                                  */
                                 for (;;) {
+#if !ENABLE_PLATFORM_MINGW32
                                         input = getc(cin);
+#else
+                                        input = _getch();
+#endif
                                         input = tolower(input);
                                         if (!ENABLE_FEATURE_USE_TERMIOS)
                                                 printf("\033[A"); /* cursor up */
@@ -172,6 +183,10 @@ int more_main(int argc UNUSED_PARAM, char **argv)
                                          * commands, else we show help msg. */
                                         if (input == ' ' || input == '\n' || input == 'q' || 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;
@@ -212,6 +227,10 @@ int more_main(int argc UNUSED_PARAM, char **argv)
                                  * will move us to a new line. */
                                 if (++lines >= 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 c22505314..d34838a35 100644
--- a/util-linux/rev.c
+++ b/util-linux/rev.c
@@ -31,7 +31,7 @@
 #endif
 
 /* In-place invert */
-static void strrev(CHAR_T *s, int len)
+static void bb_strrev(CHAR_T *s, int len)
 {
         int i;
 
@@ -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--) {
@@ -99,14 +103,14 @@ int rev_main(int argc UNUSED_PARAM, char **argv)
                                 /* Convert to wchar_t (might error out!) */
                                 int len  = mbstowcs(tmp, buf, bufsize);
                                 if (len >= 0) {
-                                        strrev(tmp, len);
+                                        bb_strrev(tmp, len);
                                         /* Convert back to char */
                                         wcstombs(buf, tmp, bufsize);
                                 }
                                 free(tmp);
                         }
 #else
-                        strrev(buf, strlen(buf));
+                        bb_strrev(buf, strlen(buf));
 #endif
                         fputs(buf, stdout);
                 }