1 files changed, 48 insertions, 0 deletions

diff --git a/editors/diff.c b/editors/diff.c
index 6f4ed9712..8911859cd 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -119,6 +119,9 @@
 //usage:     "\n        -t      Expand tabs to spaces in output"
 //usage:     "\n        -U      Output LINES lines of context"
 //usage:     "\n        -w      Ignore all whitespace"
+//usage:        IF_PLATFORM_MINGW32(IF_FEATURE_DIFF_LONG_OPTIONS(
+//usage:     "\n        --binary  Treat input as binary, not text"
+//usage:        ))
 
 #include "libbb.h"
 #include "common_bufsiz.h"
@@ -154,6 +157,9 @@ enum {                  /* Commandline flags */
         FLAG_p,         /* not implemented */
         FLAG_B,
         FLAG_E,         /* not implemented */
+#if ENABLE_PLATFORM_MINGW32 && ENABLE_FEATURE_DIFF_LONG_OPTIONS
+        FLAG_binary,
+#endif
 };
 #define FLAG(x) (1 << FLAG_##x)
 
@@ -217,6 +223,9 @@ static int read_token(FILE_and_pos_t *ft, token_t tok)
                 int t;
 
                 t = fgetc(ft->ft_fp);
+#if ENABLE_PLATFORM_MINGW32 && ENABLE_FEATURE_DIFF_LONG_OPTIONS
+ newline:
+#endif
                 if (t != EOF)
                         ft->ft_pos++;
                 is_space = (t == EOF || isspace(t));
@@ -232,6 +241,16 @@ static int read_token(FILE_and_pos_t *ft, token_t tok)
 
                 if ((option_mask32 & FLAG(w)) && is_space)
                         continue;
+#if ENABLE_PLATFORM_MINGW32 && ENABLE_FEATURE_DIFF_LONG_OPTIONS
+                if (!(option_mask32 & FLAG(binary)) && t == '\r') {
+                        int t2 = fgetc(ft->ft_fp);
+                        if (t2 == '\n') {
+                                t = t2;
+                                goto newline;
+                        }
+                        ungetc(t2, ft->ft_fp);
+                }
+#endif
 
                 /* Trim char value to low 9 bits */
                 t &= CHAR_MASK;
@@ -709,6 +728,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 +753,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 +808,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;
 }
@@ -964,6 +1004,9 @@ static const char diff_longopts[] ALIGN1 =
         "report-identical-files\0"   No_argument       "s"
         "starting-file\0"            Required_argument "S"
         "minimal\0"                  No_argument       "d"
+#if ENABLE_PLATFORM_MINGW32
+        "binary\0"                   No_argument       "\xff"
+#endif
         ;
 # define GETOPT32 getopt32long
 # define LONGOPTS ,diff_longopts
@@ -1019,6 +1062,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