Archives/falk-werner_webfuse
1
0
Fork 0
mirror of https://github.com/falk-werner/webfuse synced 2026-03-02 03:40:24 +00:00
Code Issues Releases Wiki Activity

add unit test for utimens ; fixed signature of utimens

Browse Source
This commit is contained in:
Falk Werner
2023-01-02 20:18:19 +01:00
parent 61b97f19aa
commit a5673b281c
13 changed files with 84 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/provider_main.cpp
View File

@@ -90,7 +90,7 @@ public:
return -ENOENT;
}
int utimens(std::string const &path, struct timespec tv[2], uint64_t handle) override
int utimens(std::string const &path, struct timespec const tv[2], uint64_t handle) override
{
return -ENOENT;
}

2
src/webfuse/filesystem.cpp
View File

@@ -190,7 +190,7 @@ int filesystem::fsync(std::string const & path, bool is_datasync, uint64_t handl
}
}
int filesystem::utimens(std::string const &path, struct timespec tv[2], uint64_t handle)
int filesystem::utimens(std::string const &path, struct timespec const tv[2], uint64_t handle)
{
try
{

2
src/webfuse/filesystem.hpp
View File

@@ -30,7 +30,7 @@ public:
int chown(std::string const & path, uid_t uid, gid_t gid) override;
int truncate(std::string const & path, uint64_t size, uint64_t handle) override;
int fsync(std::string const & path, bool is_datasync, uint64_t handle) override;
int utimens(std::string const &path, struct timespec tv[2], uint64_t handle) override;
int utimens(std::string const &path, struct timespec const tv[2], uint64_t handle) override;
int open(std::string const & path, int flags, uint64_t & handle) override;
int mknod(std::string const & path, mode_t mode, dev_t rdev) override;

2
src/webfuse/filesystem/empty_filesystem.cpp
View File

@@ -71,7 +71,7 @@ int empty_filesystem::fsync(std::string const & path, bool is_datasync, uint64_t
return 0;
}
int empty_filesystem::utimens(std::string const &path, struct timespec tv[2], uint64_t handle)
int empty_filesystem::utimens(std::string const &path, struct timespec const tv[2], uint64_t handle)
{
return -ENOSYS;
}

2
src/webfuse/filesystem/empty_filesystem.hpp
View File

@@ -23,7 +23,7 @@ public:
int chown(std::string const & path, uid_t uid, gid_t gid) override;
int truncate(std::string const & path, uint64_t size, uint64_t handle) override;
int fsync(std::string const & path, bool is_datasync, uint64_t handle) override;
int utimens(std::string const &path, struct timespec tv[2], uint64_t handle) override;
int utimens(std::string const &path, struct timespec const tv[2], uint64_t handle) override;
int open(std::string const & path, int flags, uint64_t & handle) override;
int mknod(std::string const & path, mode_t mode, dev_t rdev) override;

2
src/webfuse/filesystem/filesystem_i.hpp
View File

@@ -30,7 +30,7 @@ public:
virtual int chown(std::string const & path, uid_t uid, gid_t gid) = 0;
virtual int truncate(std::string const & path, uint64_t size, uint64_t handle) = 0;
virtual int fsync(std::string const & path, bool is_datasync, uint64_t handle) = 0;
virtual int utimens(std::string const &path, struct timespec tv[2], uint64_t handle) = 0;
virtual int utimens(std::string const &path, struct timespec const tv[2], uint64_t handle) = 0;
virtual int open(std::string const & path, int flags, uint64_t & handle) = 0;
virtual int mknod(std::string const & path, mode_t mode, dev_t rdev) = 0;

8
src/webfuse/fuse.cpp
View File

@@ -210,6 +210,13 @@ static int fs_statfs(char const * path, struct statvfs * buffer)
return fs->statfs(path, buffer);
}
static int fs_utimes(const char * path, const struct timespec tv[2], struct fuse_file_info * info)
{
auto * const fs = fs_get_filesystem();
auto handle = fs_get_handle(info);
return fs->utimens(path, tv, handle);
}
}
namespace webfuse
@@ -277,6 +284,7 @@ int fuse::run(int argc, char * argv[])
operations.readdir = fs_readdir;
operations.rmdir = fs_rmdir;
operations.statfs = fs_statfs;
operations.utimens = fs_utimes;
return fuse_main(argc, argv, &operations, context);
}

15
src/webfuse/provider.cpp
View File

@@ -85,6 +85,9 @@ public:
case request_type::fsync:
fs_fsync(reader, writer);
break;
case request_type::utimens:
fs_utimens(reader, writer);
break;
case request_type::create:
fs_create(reader, writer);
break;
@@ -204,6 +207,18 @@ private:
writer.write_i32(result);
}
void fs_utimens(messagereader & reader, messagewriter & writer)
{
auto const path = reader.read_str();
struct timespec times[2];
reader.read_time(times[0]);
reader.read_time(times[1]);
auto const handle = reader.read_u64();
auto const result = fs_.utimens(path, times, handle);
writer.write_i32(result);
}
void fs_create(messagereader & reader, messagewriter & writer)
{
auto const path = reader.read_str();

6
src/webfuse/ws/messagereader.cpp
View File

@@ -180,5 +180,11 @@ void messagereader::read_strings(std::vector<std::string> &entries)
}
}
void messagereader::read_time(struct timespec &time)
{
time.tv_sec = static_cast<time_t>(read_u64());
time.tv_nsec = static_cast<long>(read_u32());
}
}

2
src/webfuse/ws/messagereader.hpp
View File

@@ -40,7 +40,7 @@ public:
std::string read_bytes();
void read_strings(std::vector<std::string> &entries);
void read_time(struct timespec &time);
private: