4 files changed, 84 insertions, 7 deletions

diff --git a/editors/awk.c b/editors/awk.c
index cc17ad438..56688d72c 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -727,7 +727,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++;
@@ -2073,7 +2077,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)) {
diff --git a/editors/diff.c b/editors/diff.c
index 03c13908e..62f558944 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -711,6 +711,10 @@ static int diffreg(char *file[2])
         FILE *fp[2];
         bool binary = false, differ = false;
         int status = STATUS_SAME, i;
+#if ENABLE_PLATFORM_MINGW32
+        char *tmpfile[2] = { NULL, NULL };
+        char *tmpdir;
+#endif
 
         fp[0] = stdin;
         fp[1] = stdin;
@@ -732,10 +736,19 @@ static int diffreg(char *file[2])
                  * When we meet non-seekable file, we must make a temp copy.
                  */
                 if (lseek(fd, 0, SEEK_SET) == -1 && errno == ESPIPE) {
+#if !ENABLE_PLATFORM_MINGW32
                         char name[] = "/tmp/difXXXXXX";
                         int fd_tmp = xmkstemp(name);
 
                         unlink(name);
+#else
+                        int fd_tmp;
+
+                        if (!(tmpdir=getenv("TMPDIR")))
+                                goto out;
+                        tmpfile[i] = xasprintf("%s/difXXXXXX", tmpdir);
+                        fd_tmp = xmkstemp(tmpfile[i]);
+#endif
                         if (bb_copyfd_eof(fd, fd_tmp) < 0)
                                 xfunc_die();
                         if (fd != STDIN_FILENO)
@@ -778,6 +791,14 @@ static int diffreg(char *file[2])
 out:
         fclose_if_not_stdin(fp[0]);
         fclose_if_not_stdin(fp[1]);
+#if ENABLE_PLATFORM_MINGW32
+        for (i = 0; i < 2; i++) {
+                if (tmpfile[i]) {
+                        unlink(tmpfile[i]);
+                        free(tmpfile[i]);
+                }
+        }
+#endif
 
         return status;
 }
diff --git a/editors/sed.c b/editors/sed.c
index bec20040a..e10078b7c 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -1016,6 +1016,11 @@ static char *get_next_line(char *gets_char, char *last_puts_char)
                         char c = temp[len-1];
                         if (c == '\n' || c == '\0') {
                                 temp[len-1] = '\0';
+#if ENABLE_PLATFORM_MINGW32
+                                if (c == '\n' && len > 1 && temp[len-2] == '\r') {
+                                        temp[len-2] = '\0';
+                                }
+#endif
                                 gc = c;
                                 if (c == '\0') {
                                         int ch = fgetc(fp);
diff --git a/editors/vi.c b/editors/vi.c
index 116022c93..91e954a87 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -2800,6 +2800,14 @@ static void catch_sig(int sig)
 
 static int mysleep(int hund)    // sleep for 'hund' 1/100 seconds or stdin ready
 {
+#if ENABLE_PLATFORM_MINGW32
+        HANDLE h = GetStdHandle(STD_INPUT_HANDLE);
+        DWORD ret;
+
+        fflush(stdout);
+        ret = WaitForSingleObject(h, hund*10);
+        return ret != WAIT_TIMEOUT;
+#else
         struct pollfd pfd[1];
 
         if (hund != 0)
@@ -2808,6 +2816,7 @@ static int mysleep(int hund)	// sleep for 'hund' 1/100 seconds or stdin ready
         pfd[0].fd = STDIN_FILENO;
         pfd[0].events = POLLIN;
         return safe_poll(pfd, 1, hund*10) > 0;
+#endif
 }
 
 //----- IO Routines --------------------------------------------
@@ -2936,6 +2945,9 @@ static int file_insert(const char *fn, char *p, int initial)
                 status_line_bold("'%s' is not a regular file", fn);
                 goto fi;
         }
+#if ENABLE_PLATFORM_MINGW32
+        _setmode(fd, _O_TEXT);
+#endif
         size = (statbuf.st_size < INT_MAX ? (int)statbuf.st_size : INT_MAX);
         p += text_hole_make(p, size);
         cnt = full_read(fd, p, size);
@@ -2944,8 +2956,25 @@ static int file_insert(const char *fn, char *p, int initial)
                 p = text_hole_delete(p, p + size - 1, NO_UNDO); // un-do buffer insert
         } else if (cnt < size) {
                 // There was a partial read, shrink unused space
+#if ENABLE_PLATFORM_MINGW32
+                int i, newline;
+
+                newline = 0;
+                for ( i=0; i<cnt; ++i ) {
+                        if ( p[i] == '\n' ) {
+                                ++newline;
+                        }
+                }
+#endif
                 p = text_hole_delete(p + cnt, p + size - 1, NO_UNDO);
+#if ENABLE_PLATFORM_MINGW32
+                // on WIN32 a partial read might just mean CRs have been removed
+                if ( cnt+newline != size ) {
+                        status_line_bold("can't read '%s'", fn);
+                }
+#else
                 status_line_bold("can't read '%s'", fn);
+#endif
         }
  fi:
         close(fd);
@@ -2967,6 +2996,9 @@ static int file_insert(const char *fn, char *p, int initial)
 static int file_write(char *fn, char *first, char *last)
 {
         int fd, cnt, charcnt;
+#if ENABLE_PLATFORM_MINGW32
+        int i, newline;
+#endif
 
         if (fn == 0) {
                 status_line_bold("No current filename");
@@ -2980,8 +3012,23 @@ static int file_write(char *fn, char *first, char *last)
         if (fd < 0)
                 return -1;
         cnt = last - first + 1;
+#if ENABLE_PLATFORM_MINGW32
+        /* write file in text mode; this makes it bigger so adjust
+         * the truncation to match
+         */
+        _setmode(fd, _O_TEXT);
+        newline = 0;
+        for ( i=0; i<cnt; ++i ) {
+                if ( first[i] == '\n' ) {
+                        ++newline;
+                }
+        }
+        charcnt = full_write(fd, first, cnt);
+        ftruncate(fd, charcnt+newline);
+#else
         charcnt = full_write(fd, first, cnt);
         ftruncate(fd, charcnt);
+#endif
         if (charcnt == cnt) {
                 // good write
                 //modified_count = FALSE;
@@ -3032,7 +3079,12 @@ static void go_bottom_and_clear_to_eol(void)
 //----- Erase from cursor to end of screen -----------------------
 static void clear_to_eos(void)
 {
+#if !ENABLE_PLATFORM_MINGW32
         write1(ESC_CLEAR2EOS);
+#else
+        /* in practice clear_to_eos() always clears the entire screen */
+        reset_screen();
+#endif
 }
 
 //----- Start standout mode ------------------------------------
@@ -3578,12 +3630,7 @@ static void do_cmd(int c)
                 break;
         case 12:                        // ctrl-L  force redraw whole screen
         case 18:                        // ctrl-R  force redraw
-                place_cursor(0, 0);
-                clear_to_eos();
-                //mysleep(10); // why???
-                screen_erase(); // erase the internal screen buffer
-                last_status_cksum = 0;  // force status update
-                refresh(TRUE);  // this will redraw the entire display
+                redraw(TRUE);   // this will redraw the entire display
                 break;
         case 13:                        // Carriage Return ^M
         case '+':                       // +- goto next line