removed UTIL_doesFileExists (replaced with UTIL_isRegFile)
diff --git a/programs/fileio.c b/programs/fileio.c
index b2998ea..b8d4ef0 100644
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -191,7 +191,7 @@
f = stdin;
SET_BINARY_MODE(stdin);
} else {
- if (!UTIL_doesFileExists(srcFileName)) {
+ if (!UTIL_isRegFile(srcFileName)) {
DISPLAYLEVEL(1, "zstd: %s is not a regular file -- ignored \n", srcFileName);
return NULL;
}
diff --git a/programs/util.h b/programs/util.h
index 7f710c6..364aa65 100644
--- a/programs/util.h
+++ b/programs/util.h
@@ -182,12 +182,29 @@
return 1;
}
+
UTIL_STATIC int UTIL_isRegFile(const char* infilename)
{
stat_t statbuf;
return UTIL_getFileStat(infilename, &statbuf); /* Only need to know whether it is a regular file */
}
+
+UTIL_STATIC U32 UTIL_isDirectory(const char* infilename)
+{
+ int r;
+ stat_t statbuf;
+#if defined(_MSC_VER)
+ r = _stat64(infilename, &statbuf);
+ if (!r && (statbuf.st_mode & _S_IFDIR)) return 1;
+#else
+ r = stat(infilename, &statbuf);
+ if (!r && S_ISDIR(statbuf.st_mode)) return 1;
+#endif
+ return 0;
+}
+
+
UTIL_STATIC U64 UTIL_getFileSize(const char* infilename)
{
int r;
@@ -218,37 +235,6 @@
}
-UTIL_STATIC int UTIL_doesFileExists(const char* infilename)
-{
- int r;
-#if defined(_MSC_VER)
- struct __stat64 statbuf;
- r = _stat64(infilename, &statbuf);
- if (r || !(statbuf.st_mode & S_IFREG)) return 0; /* No good... */
-#else
- struct stat statbuf;
- r = stat(infilename, &statbuf);
- if (r || !S_ISREG(statbuf.st_mode)) return 0; /* No good... */
-#endif
- return 1;
-}
-
-
-UTIL_STATIC U32 UTIL_isDirectory(const char* infilename)
-{
- int r;
-#if defined(_MSC_VER)
- struct __stat64 statbuf;
- r = _stat64(infilename, &statbuf);
- if (!r && (statbuf.st_mode & _S_IFDIR)) return 1;
-#else
- struct stat statbuf;
- r = stat(infilename, &statbuf);
- if (!r && S_ISDIR(statbuf.st_mode)) return 1;
-#endif
- return 0;
-}
-
/*
* A modified version of realloc().
* If UTIL_realloc() fails the original block is freed.