win32: add a function to remove CRs from a text buffer

4 files changed, 19 insertions, 25 deletions

diff --git a/editors/awk.c b/editors/awk.c
index dbb26068d..c4553728d 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -1998,20 +1998,11 @@ static int ptest(node *pattern)
 #if ENABLE_PLATFORM_MINGW32
 static ssize_t FAST_FUNC safe_read_strip_cr(int fd, void *buf, size_t count)
 {
-        ssize_t n, i, j;
-        char *b = (char *)buf;
-
- retry:
-        n = safe_read(fd, buf, count);
-        if (n > 0) {
-                for (i=j=0; i<n; ++i) {
-                        if (b[i] != '\r')
-                                b[j++] = b[i];
-                }
-                if (j == 0)
-                        goto retry;
-                n = j;
-        }
+        ssize_t n;
+
+        do {
+                n = safe_read(fd, buf, count);
+        } while (n > 0 && (n=remove_cr((char *)buf, n)) == 0);
 
         return n;
 }
diff --git a/include/mingw.h b/include/mingw.h
index 4655fe511..185eb66ed 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -500,7 +500,8 @@ static inline char *auto_win32_extension(const char *p)
         return s ? auto_string(s) : NULL;
 }
 
-void FAST_FUNC convert_slashes(char *p);
+void convert_slashes(char *p) FAST_FUNC;
+size_t remove_cr(char *p, size_t len) FAST_FUNC;
 
 int err_win_to_posix(DWORD winerr);
 
diff --git a/shell/ash.c b/shell/ash.c
index 735364962..29130db0e 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -13619,16 +13619,7 @@ evalstring(char *s, int flags)
 
         s = sstrdup(s);
 #if ENABLE_PLATFORM_MINGW32
-        {
-                char *t, *u;
-
-                for (t=u=s; *t; ++t) {
-                        if (*t != '\r') {
-                                *u++ = *t;
-                        }
-                }
-                *u = '\0';
-        }
+        remove_cr(s, strlen(s)+1);
 #endif
         setinputstring(s);
         setstackmark(&smark);
diff --git a/win32/mingw.c b/win32/mingw.c
index 2a5f96c31..8217ec772 100644
--- a/win32/mingw.c
+++ b/win32/mingw.c
@@ -1273,6 +1273,17 @@ void FAST_FUNC convert_slashes(char *p)
         }
 }
 
+size_t FAST_FUNC remove_cr(char *p, size_t len)
+{
+        ssize_t i, j;
+
+        for (i=j=0; i<len; ++i) {
+                if (p[i] != '\r')
+                        p[j++] = p[i];
+        }
+        return j;
+}
+
 #undef opendir
 DIR *mingw_opendir(const char *path)
 {