From 5b45ff4f1cd511a0bfba9ff28c8d73e03d9be4bd Mon Sep 17 00:00:00 2001 From: Bimba Shrestha Date: Fri, 25 Oct 2019 11:32:38 -0700 Subject: [PATCH] Gating named file support on windows --- programs/fileio.c | 12 ++++++++++++ programs/zstdcli.c | 14 ++++++++++++++ tests/playTests.sh | 4 ++++ 3 files changed, 30 insertions(+) diff --git a/programs/fileio.c b/programs/fileio.c index d45e4bbda..20868b9b8 100644 --- a/programs/fileio.c +++ b/programs/fileio.c @@ -513,12 +513,24 @@ static FILE* FIO_openSrcFile(const char* srcFileName) return NULL; } +#ifdef _MSC_VER + + if (!UTIL_isRegularFile(srcFileName)) { + DISPLAYLEVEL(1, "zstd: %s is not a regular file -- ignored \n", + srcFileName); + return NULL; + } + +#else + if (!UTIL_isRegularFile(srcFileName) && !UTIL_isFIFO(srcFileName)) { DISPLAYLEVEL(1, "zstd: %s is not a regular file -- ignored \n", srcFileName); return NULL; } +#endif /* _MSC_VER */ + { FILE* const f = fopen(srcFileName, "rb"); if (f == NULL) DISPLAYLEVEL(1, "zstd: %s: %s \n", srcFileName, strerror(errno)); diff --git a/programs/zstdcli.c b/programs/zstdcli.c index 7a0fa6a25..66b7ae5d2 100644 --- a/programs/zstdcli.c +++ b/programs/zstdcli.c @@ -992,11 +992,25 @@ int main(int argCount, const char* argv[]) if (!followLinks) { unsigned u; for (u=0, fileNamesNb=0; u 0) CLEAN_RETURN(1); diff --git a/tests/playTests.sh b/tests/playTests.sh index 29ac1faa5..036318a54 100755 --- a/tests/playTests.sh +++ b/tests/playTests.sh @@ -1080,6 +1080,8 @@ test -f dictionary rm -f tmp* dictionary +if [ "$isWindows" = false ] ; then + println "\n===> zstd fifo named pipe test " head -c 10 /dev/zero > tmp_original mkfifo named_pipe @@ -1090,4 +1092,6 @@ $DIFF -s tmp_original tmp_decompressed rm -rf tmp* rm -rf named_pipe +fi + rm -f tmp*