From 3fe1ca62c6a64ab329b0a27d84e4fe86915cbeaa Mon Sep 17 00:00:00 2001 From: Julian Rother <julianr@fsmpi.rwth-aachen.de> Date: Fri, 5 Jan 2018 22:37:00 +0100 Subject: [PATCH] Fixed json_fileinfo to support filesizes > 4GB --- util.h | 2 +- util/filesize.c | 2 +- util/json_fileinfo.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/util.h b/util.h index e809e7e..9531313 100644 --- a/util.h +++ b/util.h @@ -14,7 +14,7 @@ char *mprintf(const char *fmt, ...); void *xmalloc(size_t size); char *hashfile(char *path); double fileduration(char *path); -size_t filesize(char *path); +off_t filesize(char *path); char *json_fileinfo(char *path); void overwrite_check(char *path, char *srcpath, char *srchash); int checktime(time_t min); diff --git a/util/filesize.c b/util/filesize.c index dec050a..b94ca39 100644 --- a/util/filesize.c +++ b/util/filesize.c @@ -3,7 +3,7 @@ #include "../util.h" -size_t filesize(char *path) +off_t filesize(char *path) { struct stat s; if (stat(path, &s)) diff --git a/util/json_fileinfo.c b/util/json_fileinfo.c index b03f564..8666ab2 100644 --- a/util/json_fileinfo.c +++ b/util/json_fileinfo.c @@ -2,6 +2,6 @@ char *json_fileinfo(char *path) { - return mprintf("\"hash\": \"%s\", \"duration\": %f, \"filesize\": %i", + return mprintf("\"hash\": \"%s\", \"duration\": %f, \"filesize\": %li", hashfile(path), fileduration(path), filesize(path)); } -- GitLab