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

set permissions, access and modification times

Browse Source
This commit is contained in:
Przemyslaw Skibinski
2016-11-02 14:08:07 +01:00
parent a42794df61
commit fcf22e3473
2 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
programs/fileio.c
View File

@ -388,17 +388,18 @@ static int FIO_compressFilename_dstFile(cRess_t ress,
const char* dstFileName, const char* srcFileName) const char* dstFileName, const char* srcFileName)
{ {
int result; int result;
time_t modtime = 0; stat_t statbuf;
int stat_result = 0;
ress.dstFile = FIO_openDstFile(dstFileName); ress.dstFile = FIO_openDstFile(dstFileName);
if (ress.dstFile==NULL) return 1; /* could not open dstFileName */ if (ress.dstFile==NULL) return 1; /* could not open dstFileName */
if (strcmp (srcFileName, stdinmark)) modtime = UTIL_getModificationTime(srcFileName); if (strcmp (srcFileName, stdinmark) && UTIL_getFileStat(srcFileName, &statbuf)) stat_result = 1;
result = FIO_compressFilename_srcFile(ress, dstFileName, srcFileName); result = FIO_compressFilename_srcFile(ress, dstFileName, srcFileName);
if (fclose(ress.dstFile)) { DISPLAYLEVEL(1, "zstd: %s: %s \n", dstFileName, strerror(errno)); result=1; } /* error closing dstFile */ if (fclose(ress.dstFile)) { DISPLAYLEVEL(1, "zstd: %s: %s \n", dstFileName, strerror(errno)); result=1; } /* error closing dstFile */
if (result!=0) { if (remove(dstFileName)) EXM_THROW(1, "zstd: %s: %s", dstFileName, strerror(errno)); } /* remove operation artefact */ if (result!=0) { if (remove(dstFileName)) EXM_THROW(1, "zstd: %s: %s", dstFileName, strerror(errno)); } /* remove operation artefact */
else if (strcmp (dstFileName, stdoutmark)) UTIL_setModificationTime(dstFileName, modtime); else if (strcmp (dstFileName, stdoutmark) && stat_result) UTIL_setFileStat(dstFileName, &statbuf);
return result; return result;
} }
@ -723,12 +724,13 @@ static int FIO_decompressDstFile(dRess_t ress,
const char* dstFileName, const char* srcFileName) const char* dstFileName, const char* srcFileName)
{ {
int result; int result;
time_t modtime = 0; stat_t statbuf;
int stat_result = 0;
ress.dstFile = FIO_openDstFile(dstFileName); ress.dstFile = FIO_openDstFile(dstFileName);
if (ress.dstFile==0) return 1; if (ress.dstFile==0) return 1;
if (strcmp (srcFileName, stdinmark)) modtime = UTIL_getModificationTime(srcFileName); if (strcmp (srcFileName, stdinmark) && UTIL_getFileStat(srcFileName, &statbuf)) stat_result = 1;
result = FIO_decompressSrcFile(ress, srcFileName); result = FIO_decompressSrcFile(ress, srcFileName);
if (fclose(ress.dstFile)) EXM_THROW(38, "Write error : cannot properly close %s", dstFileName); if (fclose(ress.dstFile)) EXM_THROW(38, "Write error : cannot properly close %s", dstFileName);
@ -737,7 +739,7 @@ static int FIO_decompressDstFile(dRess_t ress,
&& strcmp(dstFileName, nulmark) /* special case : don't remove() /dev/null (#316) */ && strcmp(dstFileName, nulmark) /* special case : don't remove() /dev/null (#316) */
&& remove(dstFileName) ) && remove(dstFileName) )
result=1; /* don't do anything special if remove() fails */ result=1; /* don't do anything special if remove() fails */
else if (strcmp (dstFileName, stdoutmark)) UTIL_setModificationTime(dstFileName, modtime); else if (strcmp (dstFileName, stdoutmark) && stat_result) UTIL_setFileStat(dstFileName, &statbuf);
return result; return result;
} }

42
programs/util.h
View File

@ -50,6 +50,7 @@ extern "C" {
#include <sys/stat.h> /* stat */ #include <sys/stat.h> /* stat */
#include <utime.h> /* utime */ #include <utime.h> /* utime */
#include <time.h> /* time */ #include <time.h> /* time */
#include <unistd.h> /* chown, stat */
#include "mem.h" /* U32, U64 */ #include "mem.h" /* U32, U64 */
@ -144,33 +145,44 @@ UTIL_STATIC void UTIL_waitForNextTick(UTIL_time_t ticksPerSecond)
/*-**************************************** /*-****************************************
* File functions * File functions
******************************************/ ******************************************/
UTIL_STATIC int UTIL_setModificationTime(const char *filename, time_t modtime) #if defined(_MSC_VER)
{ typedef struct _stat64 stat_t;
struct utimbuf timebuf; #else
typedef struct stat stat_t;
#endif
if (modtime == 0) return -1;
UTIL_STATIC int UTIL_setFileStat(const char *filename, stat_t *statbuf)
{
int res = 0;
struct utimbuf timebuf;
#if !defined(_WIN32)
res += chown(filename, statbuf->st_uid, statbuf->st_gid); /* Copy ownership */
#endif
res += chmod(filename, statbuf->st_mode & 07777); /* Copy file permissions */
timebuf.actime = time(NULL); timebuf.actime = time(NULL);
timebuf.modtime = modtime; timebuf.modtime = statbuf->st_mtime;
res += utime(filename, &timebuf); /* set access and modification times */
/* On success, zero is returned. On error, -1 is returned, and errno is set appropriately. */ errno = 0;
return utime(filename, &timebuf); return -res; /* number of errors is returned */
} }
UTIL_STATIC time_t UTIL_getModificationTime(const char* infilename) UTIL_STATIC int UTIL_getFileStat(const char* infilename, stat_t *statbuf)
{ {
int r; int r;
#if defined(_MSC_VER) #if defined(_MSC_VER)
struct _stat64 statbuf; r = _stat64(infilename, statbuf);
r = _stat64(infilename, &statbuf); if (r || !(statbuf->st_mode & S_IFREG)) return 0; /* No good... */
if (r || !(statbuf.st_mode & S_IFREG)) return 0; /* No good... */
#else #else
struct stat statbuf; r = stat(infilename, statbuf);
r = stat(infilename, &statbuf); if (r || !S_ISREG(statbuf->st_mode)) return 0; /* No good... */
if (r || !S_ISREG(statbuf.st_mode)) return 0; /* No good... */
#endif #endif
return statbuf.st_mtime; return 1;
} }