From b0beb6b3504b407b6327715822beb3890325b93e Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Tue, 9 Feb 2016 09:51:35 +0100 Subject: [PATCH] Fully support file access times --- src/filesystem/fsblobstore/utils/DirEntry.cpp | 37 +++++++------------ 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/src/filesystem/fsblobstore/utils/DirEntry.cpp b/src/filesystem/fsblobstore/utils/DirEntry.cpp index bb0a342f..2e53ca50 100644 --- a/src/filesystem/fsblobstore/utils/DirEntry.cpp +++ b/src/filesystem/fsblobstore/utils/DirEntry.cpp @@ -26,22 +26,19 @@ namespace cryfs { *reinterpret_cast(dest+offset) = mode; offset += sizeof(mode_t); - //TODO Persist times, see comment in deserializeAndAddToVector() - //static_assert(sizeof(timespec) == 16, "Ensure platform independence of the serialization"); - //*reinterpret_cast(dest+offset) = lastAccessTime; - //offset += sizeof(timespec); - //*reinterpret_cast(dest+offset) = lastModificationTime; - //offset += sizeof(timespec); - //*reinterpret_cast(dest+offset) = lastMetadataChangeTime; - //offset += sizeof(timespec); + static_assert(sizeof(timespec) == 16, "Ensure platform independence of the serialization"); + *reinterpret_cast(dest+offset) = lastAccessTime; + offset += sizeof(timespec); + *reinterpret_cast(dest+offset) = lastModificationTime; + offset += sizeof(timespec); + *reinterpret_cast(dest+offset) = lastMetadataChangeTime; + offset += sizeof(timespec); ASSERT(offset == serializedSize(), "Didn't write correct number of elements"); } size_t DirEntry::serializedSize() const { - //TODO Persist times, see comment in deserializeAndAddToVector() - //return 1 + (name.size() + 1) + key.BINARY_LENGTH + sizeof(uid_t) + sizeof(gid_t) + sizeof(mode_t) + 3*sizeof(timespec); - return 1 + (name.size() + 1) + key.BINARY_LENGTH + sizeof(uid_t) + sizeof(gid_t) + sizeof(mode_t); + return 1 + (name.size() + 1) + key.BINARY_LENGTH + sizeof(uid_t) + sizeof(gid_t) + sizeof(mode_t) + 3*sizeof(timespec); } const char *DirEntry::deserializeAndAddToVector(const char *pos, vector *result) { @@ -66,18 +63,12 @@ namespace cryfs { mode_t mode = *(mode_t*)pos; pos += sizeof(mode_t); - //TODO Persist times. This breaks compatibility though - so change cryfs::InnerConfig::HEADER - // This is already implemented, but I commented it out for now, because it would break compatibility. - //timespec lastAccessTime = *(timespec*)pos; - //pos += sizeof(timespec); - //timespec lastModificationTime = *(timespec*)pos; - //pos += sizeof(timespec); - //timespec lastMetadataChangeTime = *(timespec*)pos; - //pos += sizeof(timespec); - timespec lastAccessTime; - clock_gettime(CLOCK_REALTIME, &lastAccessTime); - timespec lastModificationTime = lastAccessTime; - timespec lastMetadataChangeTime = lastAccessTime; + timespec lastAccessTime = *(timespec*)pos; + pos += sizeof(timespec); + timespec lastModificationTime = *(timespec*)pos; + pos += sizeof(timespec); + timespec lastMetadataChangeTime = *(timespec*)pos; + pos += sizeof(timespec); result->emplace_back(type, name, key, mode, uid, gid, lastAccessTime, lastModificationTime, lastMetadataChangeTime); return pos;