1 files changed, 5 insertions, 14 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;
 }