1 files changed, 20 insertions, 1 deletions

diff --git a/editors/awk.c b/editors/awk.c
index b4f6a3741..41a57ea0c 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -735,7 +735,11 @@ static char *skip_spaces(char *p)
                 if (*p == '\\' && p[1] == '\n') {
                         p++;
                         t_lineno++;
+#if !ENABLE_PLATFORM_MINGW32
                 } else if (*p != ' ' && *p != '\t') {
+#else
+                } else if (*p != ' ' && *p != '\t' && *p != '\r') {
+#endif
                         break;
                 }
                 p++;
@@ -2031,6 +2035,21 @@ static int ptest(node *pattern)
         return istrue(evaluate(pattern, &G.ptest__v));
 }
 
+#if ENABLE_PLATFORM_MINGW32
+static ssize_t FAST_FUNC safe_read_strip_cr(int fd, void *buf, size_t count)
+{
+        ssize_t n;
+
+        do {
+                n = safe_read(fd, buf, count);
+        } while (n > 0 && (n=remove_cr((char *)buf, n)) == 0);
+
+        return n;
+}
+
+#define safe_read safe_read_strip_cr
+#endif
+
 /* read next record from stream rsm into a variable v */
 static int awk_getline(rstream *rsm, var *v)
 {
@@ -2140,7 +2159,7 @@ static int fmt_num(char *b, int size, const char *format, double n, int int_as_i
         const char *s = format;
 
         if (int_as_int && n == (long long)n) {
-                r = snprintf(b, size, "%lld", (long long)n);
+                r = snprintf(b, size, "%"LL_FMT"d", (long long)n);
         } else {
                 do { c = *s; } while (c && *++s);
                 if (strchr("diouxX", c)) {