lib/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-07-29 11:21:22 +03:00
Code Activity

Copy Permissions from Source File

Browse Source
This commit is contained in:
W. Felix Handte
2023-01-17 15:08:15 -08:00
parent 0382076af7
commit 1e3eba65a6
4 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
programs/fileio.c
View File

@ -114,11 +114,15 @@ char const* FIO_lzmaVersion(void)
#define FNSPACE 30 #define FNSPACE 30
/* Default file permissions 0666 (modulated by umask) */ /* Default file permissions 0666 (modulated by umask) */
/* Temporary restricted file permissions are used when we're going to
* chmod/chown at the end of the operation. */
#if !defined(_WIN32) #if !defined(_WIN32)
/* These macros aren't defined on windows. */ /* These macros aren't defined on windows. */
#define DEFAULT_FILE_PERMISSIONS (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH) #define DEFAULT_FILE_PERMISSIONS (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
#define TEMPORARY_FILE_PERMISSIONS (S_IRUSR|S_IWUSR)
#else #else
#define DEFAULT_FILE_PERMISSIONS (0666) #define DEFAULT_FILE_PERMISSIONS (0666)
#define TEMPORARY_FILE_PERMISSIONS (0600)
#endif #endif
/*-************************************ /*-************************************
@ -1632,22 +1636,22 @@ static int FIO_compressFilename_dstFile(FIO_ctx_t* const fCtx,
{ {
int closeDstFile = 0; int closeDstFile = 0;
int result; int result;
int transferMTime = 0; int transferStat = 0;
FILE *dstFile; FILE *dstFile;
assert(AIO_ReadPool_getFile(ress.readCtx) != NULL); assert(AIO_ReadPool_getFile(ress.readCtx) != NULL);
if (AIO_WritePool_getFile(ress.writeCtx) == NULL) { if (AIO_WritePool_getFile(ress.writeCtx) == NULL) {
int dstFilePermissions = DEFAULT_FILE_PERMISSIONS; int dstFileInitialPermissions = DEFAULT_FILE_PERMISSIONS;
if ( strcmp (srcFileName, stdinmark) if ( strcmp (srcFileName, stdinmark)
&& strcmp (dstFileName, stdoutmark) && strcmp (dstFileName, stdoutmark)
&& UTIL_isRegularFileStat(srcFileStat) ) { && UTIL_isRegularFileStat(srcFileStat) ) {
dstFilePermissions = srcFileStat->st_mode; transferStat = 1;
transferMTime = 1; dstFileInitialPermissions = TEMPORARY_FILE_PERMISSIONS;
} }
closeDstFile = 1; closeDstFile = 1;
DISPLAYLEVEL(6, "FIO_compressFilename_dstFile: opening dst: %s \n", dstFileName); DISPLAYLEVEL(6, "FIO_compressFilename_dstFile: opening dst: %s \n", dstFileName);
dstFile = FIO_openDstFile(fCtx, prefs, srcFileName, dstFileName, dstFilePermissions); dstFile = FIO_openDstFile(fCtx, prefs, srcFileName, dstFileName, dstFileInitialPermissions);
if (dstFile==NULL) return 1; /* could not open dstFileName */ if (dstFile==NULL) return 1; /* could not open dstFileName */
AIO_WritePool_setFile(ress.writeCtx, dstFile); AIO_WritePool_setFile(ress.writeCtx, dstFile);
/* Must only be added after FIO_openDstFile() succeeds. /* Must only be added after FIO_openDstFile() succeeds.
@ -1667,8 +1671,8 @@ static int FIO_compressFilename_dstFile(FIO_ctx_t* const fCtx,
DISPLAYLEVEL(1, "zstd: %s: %s \n", dstFileName, strerror(errno)); DISPLAYLEVEL(1, "zstd: %s: %s \n", dstFileName, strerror(errno));
result=1; result=1;
} }
if (transferMTime) { if (transferStat) {
UTIL_utime(dstFileName, srcFileStat); UTIL_setFileStat(dstFileName, srcFileStat);
} }
if ( (result != 0) /* operation failure */ if ( (result != 0) /* operation failure */
&& strcmp(dstFileName, stdoutmark) /* special case : don't remove() stdout */ && strcmp(dstFileName, stdoutmark) /* special case : don't remove() stdout */
@ -2479,9 +2483,7 @@ static int FIO_decompressDstFile(FIO_ctx_t* const fCtx,
{ {
int result; int result;
int releaseDstFile = 0; int releaseDstFile = 0;
int transferMTime = 0; int transferStat = 0;
(void)srcFileStat;
if ((AIO_WritePool_getFile(ress.writeCtx) == NULL) && (prefs->testMode == 0)) { if ((AIO_WritePool_getFile(ress.writeCtx) == NULL) && (prefs->testMode == 0)) {
FILE *dstFile; FILE *dstFile;
@ -2489,8 +2491,8 @@ static int FIO_decompressDstFile(FIO_ctx_t* const fCtx,
if ( strcmp(srcFileName, stdinmark) /* special case : don't transfer permissions from stdin */ if ( strcmp(srcFileName, stdinmark) /* special case : don't transfer permissions from stdin */
&& strcmp(dstFileName, stdoutmark) && strcmp(dstFileName, stdoutmark)
&& UTIL_isRegularFileStat(srcFileStat) ) { && UTIL_isRegularFileStat(srcFileStat) ) {
dstFilePermissions = srcFileStat->st_mode; transferStat = 1;
transferMTime = 1; dstFilePermissions = TEMPORARY_FILE_PERMISSIONS;
} }
releaseDstFile = 1; releaseDstFile = 1;
@ -2515,8 +2517,8 @@ static int FIO_decompressDstFile(FIO_ctx_t* const fCtx,
result = 1; result = 1;
} }
if (transferMTime) { if (transferStat) {
UTIL_utime(dstFileName, srcFileStat); UTIL_setFileStat(dstFileName, srcFileStat);
} }
if ( (result != 0) /* operation failure */ if ( (result != 0) /* operation failure */

10
tests/cli-tests/file-stat/compress-file-to-file.sh.stderr.exact
View File

@ -30,5 +30,13 @@ Trace:FileStat: > UTIL_getFileSize(file)
Trace:FileStat: > UTIL_stat(file) Trace:FileStat: > UTIL_stat(file)
Trace:FileStat: < 1 Trace:FileStat: < 1
Trace:FileStat: < 65537 Trace:FileStat: < 65537
Trace:FileStat: > UTIL_utime(file.zst) Trace:FileStat: > UTIL_setFileStat(file.zst)
Trace:FileStat: > UTIL_stat(file.zst)
Trace:FileStat: < 1
Trace:FileStat: > UTIL_utime(file.zst)
Trace:FileStat: < 0
Trace:FileStat: > UTIL_chmod(file.zst, 420)
Trace:FileStat: > chmod
Trace:FileStat: < 0
Trace:FileStat: < 0
Trace:FileStat: < 0 Trace:FileStat: < 0

10
tests/cli-tests/file-stat/decompress-file-to-file.sh.stderr.exact
View File

@ -26,5 +26,13 @@ Trace:FileStat: > UTIL_isRegularFile(file)
Trace:FileStat: > UTIL_stat(file) Trace:FileStat: > UTIL_stat(file)
Trace:FileStat: < 1 Trace:FileStat: < 1
Trace:FileStat: < 1 Trace:FileStat: < 1
Trace:FileStat: > UTIL_utime(file) Trace:FileStat: > UTIL_setFileStat(file)
Trace:FileStat: > UTIL_stat(file)
Trace:FileStat: < 1
Trace:FileStat: > UTIL_utime(file)
Trace:FileStat: < 0
Trace:FileStat: > UTIL_chmod(file, 420)
Trace:FileStat: > chmod
Trace:FileStat: < 0
Trace:FileStat: < 0
Trace:FileStat: < 0 Trace:FileStat: < 0

10
tests/playTests.sh
View File

@ -562,19 +562,9 @@ if [ "$isWindows" = false ] ; then
zstd -f -d tmp1.zst -o tmp1.out zstd -f -d tmp1.zst -o tmp1.out
assertFilePermissions tmp1.out 400 assertFilePermissions tmp1.out 400
rm -f tmp1.zst tmp1.out
umask 0666 umask 0666
chmod 0666 tmp1 tmp2 chmod 0666 tmp1 tmp2
println "test : respect umask when copying permissions in file -> file compression "
zstd -f tmp1 -o tmp1.zst
assertFilePermissions tmp1.zst 0
println "test : respect umask when copying permissions in file -> file decompression "
chmod 0666 tmp1.zst
zstd -f -d tmp1.zst -o tmp1.out
assertFilePermissions tmp1.out 0
rm -f tmp1.zst tmp1.out rm -f tmp1.zst tmp1.out
println "test : respect umask when compressing from stdin input " println "test : respect umask when compressing from stdin input "