1 files changed, 66 insertions, 0 deletions

diff --git a/editors/vi.c b/editors/vi.c
index c4360f8d3..a8b4dc5a4 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -349,7 +349,9 @@ struct globals {
 #if ENABLE_FEATURE_VI_USE_SIGNALS
         sigjmp_buf restart;     // int_handler() jumps to location remembered here
 #endif
+#if !ENABLE_PLATFORM_MINGW32
         struct termios term_orig; // remember what the cooked mode was
+#endif
 #if ENABLE_FEATURE_VI_COLON
         char *initial_cmds[3];  // currently 2 entries, NULL terminated
 #endif
@@ -545,6 +547,23 @@ static ALWAYS_INLINE int query_screen_dimensions(void)
 // sleep for 'h' 1/100 seconds, return 1/0 if stdin is (ready for read)/(not ready)
 static int mysleep(int hund)
 {
+#if ENABLE_PLATFORM_MINGW32
+        HANDLE h = GetStdHandle(STD_INPUT_HANDLE);
+        DWORD ret;
+
+        if (hund == 0) {
+                // Allow two events in the queue.  Otherwise pasted test isn't
+                // displayed because there's still a key release event waiting
+                // after the last character is processed.
+                DWORD nevent_out;
+
+                ret = GetNumberOfConsoleInputEvents(h, &nevent_out);
+                return ret != 0 ? (nevent_out > 2) : 0;
+        }
+        fflush_all();
+        ret = WaitForSingleObject(h, hund*10);
+        return ret != WAIT_TIMEOUT;
+#else
         struct pollfd pfd[1];
 
         if (hund != 0)
@@ -553,9 +572,11 @@ static int mysleep(int hund)
         pfd[0].fd = STDIN_FILENO;
         pfd[0].events = POLLIN;
         return safe_poll(pfd, 1, hund*10) > 0;
+#endif
 }
 
 //----- Set terminal attributes --------------------------------
+#if !ENABLE_PLATFORM_MINGW32
 static void rawmode(void)
 {
         // no TERMIOS_CLEAR_ISIG: leave ISIG on - allow signals
@@ -567,6 +588,10 @@ static void cookmode(void)
         fflush_all();
         tcsetattr_stdin_TCSANOW(&term_orig);
 }
+#else
+#define rawmode() ((void)0)
+#define cookmode fflush_all
+#endif
 
 //----- Terminal Drawing ---------------------------------------
 // The terminal is made up of 'rows' line of 'columns' columns.
@@ -1105,7 +1130,11 @@ static char *get_input_line(const char *prompt)
                 c = get_one_char();
                 if (c == '\n' || c == '\r' || c == 27)
                         break;          // this is end of input
+#if !ENABLE_PLATFORM_MINGW32
                 if (c == term_orig.c_cc[VERASE] || c == 8 || c == 127) {
+#else
+                if (c == 8 || c == 127) {
+#endif
                         // user wants to erase prev char
                         buf[--i] = '\0';
                         write1("\b \b"); // erase char on screen
@@ -1858,6 +1887,18 @@ static char *yank_delete(char *start, char *stop, int dist, int yf, int undo)
         return p;
 }
 
+#if ENABLE_PLATFORM_MINGW32
+static int count_cr(char *p, int len)
+{
+        int i, cnt;
+
+        for (i = cnt = 0; i < len; ++i)
+                if (p[i] == '\n')
+                        ++cnt;
+        return cnt;
+}
+#endif
+
 // might reallocate text[]!
 static int file_insert(const char *fn, char *p, int initial)
 {
@@ -1870,7 +1911,11 @@ static int file_insert(const char *fn, char *p, int initial)
         if (p > end)
                 p = end;
 
+#if !ENABLE_PLATFORM_MINGW32
         fd = open(fn, O_RDONLY);
+#else
+        fd = open(fn, O_RDONLY | _O_TEXT);
+#endif
         if (fd < 0) {
                 if (!initial)
                         status_line_bold_errno(fn);
@@ -1893,8 +1938,15 @@ static int file_insert(const char *fn, char *p, int initial)
                 status_line_bold_errno(fn);
                 p = text_hole_delete(p, p + size - 1, NO_UNDO); // un-do buffer insert
         } else if (cnt < size) {
+#if ENABLE_PLATFORM_MINGW32
+                // On WIN32 a partial read might just mean CRs have been removed
+                int cnt_cr = cnt + count_cr(p, cnt);
+#endif
                 // There was a partial read, shrink unused space
                 p = text_hole_delete(p + cnt, p + size - 1, NO_UNDO);
+#if ENABLE_PLATFORM_MINGW32
+                if (cnt_cr < size)
+#endif
                 status_line_bold("can't read '%s'", fn);
         }
  fi:
@@ -2001,7 +2053,11 @@ static char *char_insert(char *p, char c, int undo) // insert the char c at 'p'
                 if ((p[-1] != '\n') && (dot > text)) {
                         p--;
                 }
+#if !ENABLE_PLATFORM_MINGW32
         } else if (c == term_orig.c_cc[VERASE] || c == 8 || c == 127) { // Is this a BS
+#else
+        } else if (c == 8 || c == 127) { // Is this a BS
+#endif
                 if (p > text) {
                         p--;
                         p = text_hole_delete(p, p, ALLOW_UNDO_QUEUED);  // shrink buffer 1 char
@@ -2122,12 +2178,22 @@ static int file_write(char *fn, char *first, char *last)
         // By popular request we do not open file with O_TRUNC,
         // but instead ftruncate() it _after_ successful write.
         // Might reduce amount of data lost on power fail etc.
+#if !ENABLE_PLATFORM_MINGW32
         fd = open(fn, (O_WRONLY | O_CREAT), 0666);
+#else
+        fd = open(fn, (O_WRONLY | O_CREAT | _O_TEXT), 0666);
+#endif
         if (fd < 0)
                 return -1;
         cnt = last - first + 1;
         charcnt = full_write(fd, first, cnt);
+#if !ENABLE_PLATFORM_MINGW32
         ftruncate(fd, charcnt);
+#else
+        // File was written in text mode; this makes it bigger so adjust
+        // the truncation to match.
+        ftruncate(fd, charcnt + count_cr(first, cnt));
+#endif
         if (charcnt == cnt) {
                 // good write
                 //modified_count = FALSE;