1 files changed, 53 insertions, 6 deletions

diff --git a/editors/vi.c b/editors/vi.c
index 38a4692fd..b81f2b92d 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -2801,6 +2801,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)
@@ -2809,6 +2817,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 --------------------------------------------
@@ -2930,6 +2939,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);
@@ -2938,8 +2950,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);
@@ -2961,6 +2990,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");
@@ -2974,8 +3006,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;
@@ -3026,7 +3073,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 ------------------------------------
@@ -3572,12 +3624,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