diff --git a/appveyor.yml b/appveyor.yml index 87fa5c12d..dd2c02ac4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -173,8 +173,6 @@ sh -e playTests.sh --test-large-data && fullbench.exe -i1 && fullbench.exe -i1 -P0 && - fuzzer_VS2008_%PLATFORM%_Release.exe %FUZZERTEST% && - fuzzer_VS2010_%PLATFORM%_Release.exe %FUZZERTEST% && fuzzer_VS2012_%PLATFORM%_Release.exe %FUZZERTEST% && fuzzer_VS2013_%PLATFORM%_Release.exe %FUZZERTEST% && fuzzer_VS2015_%PLATFORM%_Release.exe %FUZZERTEST% diff --git a/programs/fileio.c b/programs/fileio.c index c0d6494ec..983376728 100644 --- a/programs/fileio.c +++ b/programs/fileio.c @@ -525,7 +525,11 @@ static FILE* FIO_openSrcFile(const char* srcFileName) return NULL; } - if (!UTIL_isRegularFile(srcFileName) && !UTIL_isFIFO(srcFileName)) { + if (!UTIL_isRegularFile(srcFileName) +#ifndef _MSC_VER + && !UTIL_isFIFO(srcFileName) +#endif /* _MSC_VER */ + ) { DISPLAYLEVEL(1, "zstd: %s is not a regular file -- ignored \n", srcFileName); return NULL; diff --git a/programs/util.c b/programs/util.c index 2143d178b..5d15450d2 100644 --- a/programs/util.c +++ b/programs/util.c @@ -126,6 +126,8 @@ int UTIL_isSameFile(const char* fName1, const char* fName2) #endif } +#ifndef _MSC_VER +/* Using this to distinguish named pipes */ U32 UTIL_isFIFO(const char* infilename) { /* macro guards, as defined in : https://linux.die.net/man/2/lstat */ @@ -137,7 +139,7 @@ U32 UTIL_isFIFO(const char* infilename) (void)infilename; return 0; } - +#endif U32 UTIL_isLink(const char* infilename) { diff --git a/programs/util.h b/programs/util.h index 0d0642cb5..1f524f293 100644 --- a/programs/util.h +++ b/programs/util.h @@ -137,7 +137,9 @@ int UTIL_compareStr(const void *p1, const void *p2); int UTIL_isCompressedFile(const char* infilename, const char *extensionList[]); const char* UTIL_getFileExtension(const char* infilename); +#ifndef _MSC_VER U32 UTIL_isFIFO(const char* infilename); +#endif U32 UTIL_isLink(const char* infilename); #define UTIL_FILESIZE_UNKNOWN ((U64)(-1)) U64 UTIL_getFileSize(const char* infilename); diff --git a/programs/zstdcli.c b/programs/zstdcli.c index 5463c019f..cd6b40bc0 100644 --- a/programs/zstdcli.c +++ b/programs/zstdcli.c @@ -1005,7 +1005,11 @@ int main(int argCount, const char* argv[]) if (!followLinks) { unsigned u; for (u=0, fileNamesNb=0; u zstd fifo named pipe test " head -c 10 /dev/zero > tmp_original mkfifo named_pipe @@ -1180,4 +1182,6 @@ $DIFF -s tmp_original tmp_decompressed rm -rf tmp* rm -rf named_pipe +fi + rm -f tmp*