rev: fix to build with mingw32

2 files changed, 9 insertions, 5 deletions

diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig
index 7840dd68a..bad3073fe 100644
--- a/configs/mingw32_defconfig
+++ b/configs/mingw32_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.23.0.git
-# Tue Mar 11 20:15:08 2014
+# Tue Mar 11 20:48:59 2014
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -540,7 +540,7 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
 # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
 # CONFIG_FEATURE_MDEV_EXEC is not set
 # CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
-# CONFIG_REV is not set
+CONFIG_REV=y
 # CONFIG_ACPID is not set
 # CONFIG_FEATURE_ACPID_COMPAT is not set
 # CONFIG_BLKID is not set
diff --git a/util-linux/rev.c b/util-linux/rev.c
index 3c1b22f09..f952447e4 100644
--- a/util-linux/rev.c
+++ b/util-linux/rev.c
@@ -32,7 +32,7 @@
 #endif
 
 /* In-place invert */
-static void strrev(CHAR_T *s, int len)
+static void bb_strrev(CHAR_T *s, int len)
 {
         int i;
 
@@ -40,6 +40,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--) {
@@ -100,14 +104,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);
                 }