4 files changed, 133 insertions, 1 deletions

diff --git a/editors/awk.c b/editors/awk.c
index d25508e5d..c4553728d 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -734,7 +734,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++;
@@ -1991,6 +1995,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)
 {
@@ -2100,7 +2119,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 1462a9b18..cf531460f 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -709,6 +709,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;
@@ -730,10 +734,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)
@@ -776,6 +789,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;
 }
@@ -1019,6 +1040,11 @@ int diff_main(int argc UNUSED_PARAM, char **argv)
          * 255, or if a local inode number (st_ino) exceeds 16777215.
          */
         if (ENABLE_DESKTOP
+         && (ENABLE_PLATFORM_POSIX || ENABLE_FEATURE_EXTRA_FILE_DATA)
+#if ENABLE_FEATURE_EXTRA_FILE_DATA
+         /* ignore invalid inode numbers */
+         && stb[0].st_ino != 0
+#endif
          && stb[0].st_ino == stb[1].st_ino
          && stb[0].st_dev == stb[1].st_dev
          && stb[0].st_size == stb[1].st_size
diff --git a/editors/sed.c b/editors/sed.c
index bb39de149..a5cedbd8d 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -74,6 +74,9 @@
 //usage:     "\n                Optionally back files up, appending SFX"
 //usage:     "\n        -n      Suppress automatic printing of pattern space"
 //usage:     "\n        -r,-E   Use extended regex syntax"
+//usage:     IF_PLATFORM_MINGW32(
+//usage:     "\n        -b      Keep CR/LF (Windows-only)"
+//usage:     )
 //usage:     "\n"
 //usage:     "\nIf no -e or -f, the first non-option argument is the sed command string."
 //usage:     "\nRemaining arguments are input files (stdin if none)."
@@ -132,6 +135,9 @@ static const char semicolon_whitespace[] ALIGN1 = "; \n\r\t\v";
 struct globals {
         /* options */
         int be_quiet, regex_type;
+#if ENABLE_PLATFORM_MINGW32
+        int keep_cr;
+#endif
 
         FILE *nonstdout;
         char *outname, *hold_space;
@@ -1024,6 +1030,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 (!G.keep_cr && c == '\n' && len > 1 && temp[len-2] == '\r') {
+                                        temp[len-2] = '\0';
+                                }
+#endif
                                 gc = c;
                                 if (c == '\0') {
                                         int ch = fgetc(fp);
@@ -1498,7 +1509,12 @@ int sed_main(int argc UNUSED_PARAM, char **argv)
                 "quiet\0"           No_argument         "n"
                 "silent\0"          No_argument         "n"
                 "expression\0"      Required_argument   "e"
+# if !ENABLE_PLATFORM_MINGW32
                 "file\0"            Required_argument   "f";
+# else
+                "file\0"            Required_argument   "f"
+                "binary\0"          No_argument         "b";
+# endif
 #endif
 
         INIT_G();
@@ -1522,6 +1538,7 @@ int sed_main(int argc UNUSED_PARAM, char **argv)
          */
         opt = getopt32long(argv, "^"
                         "i::rEne:*f:*"
+                        IF_PLATFORM_MINGW32("b")
                         "\0" "nn"/*count -n*/,
                         sed_longopts,
                         &opt_i, &opt_e, &opt_f,
@@ -1535,6 +1552,10 @@ int sed_main(int argc UNUSED_PARAM, char **argv)
                 G.regex_type |= REG_EXTENDED; // -r or -E
         //if (opt & 8)
         //      G.be_quiet++; // -n (implemented with a counter instead)
+#if ENABLE_PLATFORM_MINGW32
+        if (opt & 0x40)
+                G.keep_cr = 1;
+#endif
         while (opt_e) { // -e
                 add_cmd_block(llist_pop(&opt_e));
         }
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;