1 files changed, 26 insertions, 0 deletions

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