From: Yann Collet <cyan@fb.com>
Date: Wed, 26 Dec 2018 23:51:34 +0000 (-0800)
Subject: fixed detection of input==output on Visual
X-Git-Tag: v1.3.8^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b7a1d6127a0306731d4f98a0da2b9e91c078242;p=thirdparty%2Fzstd.git

fixed detection of input==output on Visual

due to bad support of inode identifiers.
On Visual, option is limited to same file name,
which is imperfect, but way better than disabling the feature entirely.

It's enough to pass associated tests.
---

diff --git a/programs/fileio.c b/programs/fileio.c
index a5460ba2d..9fb795ed3 100644
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -423,16 +423,29 @@ static FILE* FIO_openDstFile(const char* srcFileName, const char* dstFileName)
         return stdout;
     }
 
+    /* ensure dst is not the same file as src */
     if (srcFileName != NULL) {
+#ifdef _MSC_VER
+        /* note : Visual does not support file identification by inode.
+         *        The following work-around is limited to detecting exact name repetition only,
+         *        aka `filename` is considered different from `subdir/../filename` */
+        if (!strcmp(srcFileName, dstFileName)) {
+            DISPLAYLEVEL(1, "zstd: Refusing to open a output file which will overwrite the input file \n");
+            return NULL;
+        }
+#else
         stat_t srcStat;
         stat_t dstStat;
-        if ( UTIL_getFileStat(srcFileName, &srcStat)
-          && UTIL_getFileStat(dstFileName, &dstStat) ) {
-            if ( srcStat.st_dev == dstStat.st_dev
-              && srcStat.st_ino == dstStat.st_ino ) {
+        if (UTIL_getFileStat(srcFileName, &srcStat)
+            && UTIL_getFileStat(dstFileName, &dstStat)) {
+            if (srcStat.st_dev == dstStat.st_dev
+                && srcStat.st_ino == dstStat.st_ino) {
                 DISPLAYLEVEL(1, "zstd: Refusing to open a output file which will overwrite the input file \n");
                 return NULL;
-    }   }   }
+            }
+        }
+#endif
+    }
 
     if (g_sparseFileSupport == 1) {
         g_sparseFileSupport = ZSTD_SPARSE_DEFAULT;