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

created UTIL_chmod()

Browse Source 
protecting "/dev/null" from having its permissions changed.

also : minor : improved consistency of util.h API
This commit is contained in:
Yann Collet 2019-11-25 13:45:22 -08:00
parent 60db21a677
commit 9a22140ef4
4 changed files with 58 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
programs/fileio.c
View File

@ -502,7 +502,7 @@ static int FIO_remove(const char* path)
#if defined(_WIN32) || defined(WIN32) #if defined(_WIN32) || defined(WIN32)
/* windows doesn't allow remove read-only files, /* windows doesn't allow remove read-only files,
* so try to make it writable first */ * so try to make it writable first */
chmod(path, _S_IWRITE); UTIL_chmod(path, _S_IWRITE);
#endif #endif
return remove(path); return remove(path);
} }
@ -526,9 +526,7 @@ static FILE* FIO_openSrcFile(const char* srcFileName)
} }
if (!UTIL_isRegularFile(srcFileName) if (!UTIL_isRegularFile(srcFileName)
#ifndef _MSC_VER && !UTIL_isFIFO(srcFileName)
&& !UTIL_isFIFO(srcFileName)
#endif /* _MSC_VER */
) { ) {
DISPLAYLEVEL(1, "zstd: %s is not a regular file -- ignored \n", DISPLAYLEVEL(1, "zstd: %s is not a regular file -- ignored \n",
srcFileName); srcFileName);
@ -613,7 +611,7 @@ FIO_openDstFile(FIO_prefs_t* const prefs,
&& strcmp (srcFileName, stdinmark) && strcmp (srcFileName, stdinmark)
&& strcmp(dstFileName, nulmark) ) { && strcmp(dstFileName, nulmark) ) {
/* reduce rights on newly created dst file while compression is ongoing */ /* reduce rights on newly created dst file while compression is ongoing */
chmod(dstFileName, 00600); UTIL_chmod(dstFileName, 00600);
} }
return f; return f;
} }

44
programs/util.c
View File

@ -24,6 +24,21 @@ extern "C" {
#include <direct.h> /* needed for _mkdir in windows */ #include <direct.h> /* needed for _mkdir in windows */
#endif #endif
#if defined(_MSC_VER)
#define chmod _chmod
#endif
/*-*************************************
* Constants
***************************************/
#define LIST_SIZE_INCREASE (8*1024)
/*-*************************************
* Functions
***************************************/
int UTIL_fileExist(const char* filename) int UTIL_fileExist(const char* filename)
{ {
stat_t statbuf; stat_t statbuf;
@ -54,6 +69,13 @@ int UTIL_getFileStat(const char* infilename, stat_t *statbuf)
return 1; return 1;
} }
/* like chmod, but avoid changing permission of /dev/null */
int UTIL_chmod(char const* filename, mode_t permissions)
{
if (!strcmp(filename, "/dev/null")) return 0; /* pretend success, but don't change anything */
return chmod(filename, permissions);
}
int UTIL_setFileStat(const char *filename, stat_t *statbuf) int UTIL_setFileStat(const char *filename, stat_t *statbuf)
{ {
int res = 0; int res = 0;
@ -82,21 +104,20 @@ int UTIL_setFileStat(const char *filename, stat_t *statbuf)
res += chown(filename, statbuf->st_uid, statbuf->st_gid); /* Copy ownership */ res += chown(filename, statbuf->st_uid, statbuf->st_gid); /* Copy ownership */
#endif #endif
res += chmod(filename, statbuf->st_mode & 07777); /* Copy file permissions */ res += UTIL_chmod(filename, statbuf->st_mode & 07777); /* Copy file permissions */
errno = 0; errno = 0;
return -res; /* number of errors is returned */ return -res; /* number of errors is returned */
} }
U32 UTIL_isDirectory(const char* infilename) int UTIL_isDirectory(const char* infilename)
{ {
int r;
stat_t statbuf; stat_t statbuf;
#if defined(_MSC_VER) #if defined(_MSC_VER)
r = _stat64(infilename, &statbuf); int const r = _stat64(infilename, &statbuf);
if (!r && (statbuf.st_mode & _S_IFDIR)) return 1; if (!r && (statbuf.st_mode & _S_IFDIR)) return 1;
#else #else
r = stat(infilename, &statbuf); int const r = stat(infilename, &statbuf);
if (!r && S_ISDIR(statbuf.st_mode)) return 1; if (!r && S_ISDIR(statbuf.st_mode)) return 1;
#endif #endif
return 0; return 0;
@ -126,28 +147,25 @@ int UTIL_isSameFile(const char* fName1, const char* fName2)
#endif #endif
} }
#ifndef _MSC_VER /* UTIL_isFIFO : distinguish named pipes */
/* Using this to distinguish named pipes */ int UTIL_isFIFO(const char* infilename)
U32 UTIL_isFIFO(const char* infilename)
{ {
/* macro guards, as defined in : https://linux.die.net/man/2/lstat */ /* macro guards, as defined in : https://linux.die.net/man/2/lstat */
#if PLATFORM_POSIX_VERSION >= 200112L #if PLATFORM_POSIX_VERSION >= 200112L
stat_t statbuf; stat_t statbuf;
int r = UTIL_getFileStat(infilename, &statbuf); int const r = UTIL_getFileStat(infilename, &statbuf);
if (!r && S_ISFIFO(statbuf.st_mode)) return 1; if (!r && S_ISFIFO(statbuf.st_mode)) return 1;
#endif #endif
(void)infilename; (void)infilename;
return 0; return 0;
} }
#endif
U32 UTIL_isLink(const char* infilename) int UTIL_isLink(const char* infilename)
{ {
/* macro guards, as defined in : https://linux.die.net/man/2/lstat */ /* macro guards, as defined in : https://linux.die.net/man/2/lstat */
#if PLATFORM_POSIX_VERSION >= 200112L #if PLATFORM_POSIX_VERSION >= 200112L
int r;
stat_t statbuf; stat_t statbuf;
r = lstat(infilename, &statbuf); int const r = lstat(infilename, &statbuf);
if (!r && S_ISLNK(statbuf.st_mode)) return 1; if (!r && S_ISLNK(statbuf.st_mode)) return 1;
#endif #endif
(void)infilename; (void)infilename;

42
programs/util.h
View File

@ -30,12 +30,12 @@ extern "C" {
# include <io.h> /* _chmod */ # include <io.h> /* _chmod */
#else #else
# include <unistd.h> /* chown, stat */ # include <unistd.h> /* chown, stat */
#if PLATFORM_POSIX_VERSION < 200809L # if PLATFORM_POSIX_VERSION < 200809L
# include <utime.h> /* utime */ # include <utime.h> /* utime */
#else # else
# include <fcntl.h> /* AT_FDCWD */ # include <fcntl.h> /* AT_FDCWD */
# include <sys/stat.h> /* utimensat */ # include <sys/stat.h> /* utimensat */
#endif # endif
#endif #endif
#include <time.h> /* clock_t, clock, CLOCKS_PER_SEC, nanosleep */ #include <time.h> /* clock_t, clock, CLOCKS_PER_SEC, nanosleep */
#include "mem.h" /* U32, U64 */ #include "mem.h" /* U32, U64 */
@ -85,12 +85,6 @@ extern "C" {
#endif #endif
/*-*************************************
* Constants
***************************************/
#define LIST_SIZE_INCREASE (8*1024)
/*-**************************************** /*-****************************************
* Compiler specifics * Compiler specifics
******************************************/ ******************************************/
@ -120,7 +114,6 @@ extern int g_utilDisplayLevel;
* File functions * File functions
******************************************/ ******************************************/
#if defined(_MSC_VER) #if defined(_MSC_VER)
#define chmod _chmod
typedef struct __stat64 stat_t; typedef struct __stat64 stat_t;
#else #else
typedef struct stat stat_t; typedef struct stat stat_t;
@ -129,30 +122,29 @@ extern int g_utilDisplayLevel;
int UTIL_fileExist(const char* filename); int UTIL_fileExist(const char* filename);
int UTIL_isRegularFile(const char* infilename); int UTIL_isRegularFile(const char* infilename);
int UTIL_setFileStat(const char* filename, stat_t* statbuf); int UTIL_isDirectory(const char* infilename);
U32 UTIL_isDirectory(const char* infilename);
int UTIL_getFileStat(const char* infilename, stat_t* statbuf);
int UTIL_isSameFile(const char* file1, const char* file2); int UTIL_isSameFile(const char* file1, const char* file2);
int UTIL_compareStr(const void *p1, const void *p2);
int UTIL_isCompressedFile(const char* infilename, const char *extensionList[]); int UTIL_isCompressedFile(const char* infilename, const char *extensionList[]);
const char* UTIL_getFileExtension(const char* infilename); int UTIL_isLink(const char* infilename);
int UTIL_isFIFO(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)) #define UTIL_FILESIZE_UNKNOWN ((U64)(-1))
U64 UTIL_getFileSize(const char* infilename); U64 UTIL_getFileSize(const char* infilename);
U64 UTIL_getTotalFileSize(const char* const * const fileNamesTable, unsigned nbFiles); U64 UTIL_getTotalFileSize(const char* const * const fileNamesTable, unsigned nbFiles);
int UTIL_getFileStat(const char* infilename, stat_t* statbuf);
int UTIL_setFileStat(const char* filename, stat_t* statbuf);
int UTIL_chmod(char const* filename, mode_t permissions); /*< like chmod, but avoid changing permission of /dev/null */
int UTIL_compareStr(const void *p1, const void *p2);
const char* UTIL_getFileExtension(const char* infilename);
/* /*
* A modified version of realloc(). * A modified version of realloc().
* If UTIL_realloc() fails the original block is freed. * If UTIL_realloc() fails the original block is freed.
*/ */
UTIL_STATIC void* UTIL_realloc(void *ptr, size_t size) UTIL_STATIC void* UTIL_realloc(void* ptr, size_t size)
{ {
void *newptr = realloc(ptr, size); void* const newptr = realloc(ptr, size);
if (newptr) return newptr; if (newptr) return newptr;
free(ptr); free(ptr);
return NULL; return NULL;

21
programs/zstdcli.c
View File

@ -1005,16 +1005,13 @@ int main(int argCount, const char* argv[])
if (!followLinks) { if (!followLinks) {
unsigned u; unsigned u;
for (u=0, fileNamesNb=0; u<filenameIdx; u++) { for (u=0, fileNamesNb=0; u<filenameIdx; u++) {
if (UTIL_isLink(filenameTable[u]) if ( UTIL_isLink(filenameTable[u])
#ifndef _MSC_VER && !UTIL_isFIFO(filenameTable[u])
&& !UTIL_isFIFO(filenameTable[u])
#endif /* _MSC_VER */
) { ) {
DISPLAYLEVEL(2, "Warning : %s is a symbolic link, ignoring\n", filenameTable[u]); DISPLAYLEVEL(2, "Warning : %s is a symbolic link, ignoring\n", filenameTable[u]);
} else { } else {
filenameTable[fileNamesNb++] = filenameTable[u]; filenameTable[fileNamesNb++] = filenameTable[u];
} } }
}
if (fileNamesNb == 0 && filenameIdx > 0) if (fileNamesNb == 0 && filenameIdx > 0)
CLEAN_RETURN(1); CLEAN_RETURN(1);
filenameIdx = fileNamesNb; filenameIdx = fileNamesNb;
@ -1027,8 +1024,7 @@ int main(int argCount, const char* argv[])
free((void*)filenameTable); free((void*)filenameTable);
filenameTable = extendedFileList; filenameTable = extendedFileList;
filenameIdx = fileNamesNb; filenameIdx = fileNamesNb;
} } }
}
#else #else
(void)followLinks; (void)followLinks;
#endif #endif
@ -1074,18 +1070,15 @@ int main(int argCount, const char* argv[])
DISPLAYLEVEL(3, "Benchmarking %s \n", filenameTable[i]); DISPLAYLEVEL(3, "Benchmarking %s \n", filenameTable[i]);
for(c = cLevel; c <= cLevelLast; c++) { for(c = cLevel; c <= cLevelLast; c++) {
BMK_benchFilesAdvanced(&filenameTable[i], 1, dictFileName, c, &compressionParams, g_displayLevel, &benchParams); BMK_benchFilesAdvanced(&filenameTable[i], 1, dictFileName, c, &compressionParams, g_displayLevel, &benchParams);
} } }
}
} else { } else {
for(; cLevel <= cLevelLast; cLevel++) { for(; cLevel <= cLevelLast; cLevel++) {
BMK_benchFilesAdvanced(filenameTable, filenameIdx, dictFileName, cLevel, &compressionParams, g_displayLevel, &benchParams); BMK_benchFilesAdvanced(filenameTable, filenameIdx, dictFileName, cLevel, &compressionParams, g_displayLevel, &benchParams);
} } }
}
} else { } else {
for(; cLevel <= cLevelLast; cLevel++) { for(; cLevel <= cLevelLast; cLevel++) {
BMK_syntheticTest(cLevel, compressibility, &compressionParams, g_displayLevel, &benchParams); BMK_syntheticTest(cLevel, compressibility, &compressionParams, g_displayLevel, &benchParams);
} } }
}
#else #else
(void)bench_nbSeconds; (void)blockSize; (void)setRealTimePrio; (void)separateFiles; (void)compressibility; (void)bench_nbSeconds; (void)blockSize; (void)setRealTimePrio; (void)separateFiles; (void)compressibility;