facebook/zstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix incorrect dictName/FileName comparison on Windows

Browse Source 
inode identification does not seem to work on Windows,
even with on a msys2 posix layer.
This commit is contained in:
Yann Collet 2019-10-17 10:56:14 -07:00
parent 8e715d57c5
commit 000404311f
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
programs/util.c
View File

@ -106,20 +106,23 @@ int UTIL_compareStr(const void *p1, const void *p2) {
return strcmp(* (char * const *) p1, * (char * const *) p2); return strcmp(* (char * const *) p1, * (char * const *) p2);
} }
int UTIL_isSameFile(const char* file1, const char* file2) int UTIL_isSameFile(const char* fName1, const char* fName2)
{ {
#if defined(_MSC_VER) assert(fName1 != NULL); assert(fName2 != NULL);
#if defined(_MSC_VER) || defined(_WIN32)
/* note : Visual does not support file identification by inode. /* note : Visual does not support file identification by inode.
* inode does not work on Windows, even with a posix layer, like msys2.
* The following work-around is limited to detecting exact name repetition only, * The following work-around is limited to detecting exact name repetition only,
* aka `filename` is considered different from `subdir/../filename` */ * aka `filename` is considered different from `subdir/../filename` */
return !strcmp(file1, file2); return !strcmp(file1, file2);
#else #else
stat_t file1Stat; { stat_t file1Stat;
stat_t file2Stat; stat_t file2Stat;
return UTIL_getFileStat(file1, &file1Stat) return UTIL_getFileStat(fName1, &file1Stat)
&& UTIL_getFileStat(file2, &file2Stat) && UTIL_getFileStat(fName2, &file2Stat)
&& (file1Stat.st_dev == file2Stat.st_dev) && (file1Stat.st_dev == file2Stat.st_dev)
&& (file1Stat.st_ino == file2Stat.st_ino); && (file1Stat.st_ino == file2Stat.st_ino);
}
#endif #endif
} }