diff options
Diffstat (limited to 'netfs/daemon/daemonVolume.cpp')
-rw-r--r-- | netfs/daemon/daemonVolume.cpp | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/netfs/daemon/daemonVolume.cpp b/netfs/daemon/daemonVolume.cpp index 096d748..3ae43da 100644 --- a/netfs/daemon/daemonVolume.cpp +++ b/netfs/daemon/daemonVolume.cpp @@ -1,25 +1,22 @@ -#include <Ice/ObjectAdapter.h> -#include <cerrno> -#include <map> -#include <unistd.h> -#include <sys/stat.h> -#include <climits> -#include <fcntl.h> #include "daemonVolume.h" -#include "daemonFile.h" +#include "daemon.h" #include "daemonDirectory.h" +#include "daemonFile.h" #include "modeCheck.h" +#include <Ice/ObjectAdapter.h> #include <boost/algorithm/string/predicate.hpp> +#include <cerrno> +#include <climits> #include <entCache.h> -#include "daemon.h" +#include <fcntl.h> +#include <map> +#include <sys/stat.h> +#include <unistd.h> extern std::map<Ice::Int, int> files; VolumeServer::VolumeServer(const std::filesystem::path & r, const EntCache<User> & u, const EntCache<Group> & g) : - root(std::filesystem::canonical(r)), - userLookup(u), - groupLookup(g), - converter(u, g) + root(std::filesystem::canonical(r)), userLookup(u), groupLookup(g), converter(u, g) { } @@ -33,7 +30,8 @@ Ice::Int VolumeServer::access(const NetFS::ReqEnv re, std::string path, Ice::Int mode, const Ice::Current &) { ModeCheck mc(re, root, userLookup, groupLookup); - struct stat s {}; + struct stat s { + }; std::filesystem::path p(resolvePath(std::move(path))); if (::stat(p.c_str(), &s) != 0) { return errno; @@ -59,7 +57,8 @@ NetFS::Attr VolumeServer::getattr(const NetFS::ReqEnv re, std::string path, const Ice::Current &) { ModeCheck mc(re, root, userLookup, groupLookup); - struct stat s {}; + struct stat s { + }; std::filesystem::path p(resolvePath(std::move(path))); mc.AssertReadParent(p); if (::lstat(p.c_str(), &s) != 0) { @@ -69,7 +68,7 @@ VolumeServer::getattr(const NetFS::ReqEnv re, std::string path, const Ice::Curre } void -VolumeServer::mknod(const NetFS::ReqEnv re, std::string path, Ice::Int mode, Ice::Int dev, const Ice::Current&) +VolumeServer::mknod(const NetFS::ReqEnv re, std::string path, Ice::Int mode, Ice::Int dev, const Ice::Current &) { ModeCheck mc(re, root, userLookup, groupLookup); errno = 0; @@ -113,7 +112,8 @@ VolumeServer::link(const NetFS::ReqEnv re, std::string path1, std::string path2, } void -VolumeServer::rename(const NetFS::ReqEnv re, std::string from, std::string to, const Ice::optional<Ice::Int> flags, const Ice::Current &) +VolumeServer::rename(const NetFS::ReqEnv re, std::string from, std::string to, const Ice::optional<Ice::Int> flags, + const Ice::Current &) { ModeCheck mc(re, root, userLookup, groupLookup); errno = 0; @@ -170,12 +170,12 @@ VolumeServer::chown(const NetFS::ReqEnv re, std::string path, Ice::Int uid, Ice: } void -VolumeServer::utimens(const NetFS::ReqEnv re, std::string path, - Ice::Long s0, Ice::Long ns0, Ice::Long s1, Ice::Long ns1, const Ice::Current&) +VolumeServer::utimens(const NetFS::ReqEnv re, std::string path, Ice::Long s0, Ice::Long ns0, Ice::Long s1, + Ice::Long ns1, const Ice::Current &) { ModeCheck mc(re, root, userLookup, groupLookup); errno = 0; - std::array<struct timespec, 2> times { { { s0, ns0 }, { s1, ns1 } } }; + std::array<struct timespec, 2> times {{{s0, ns0}, {s1, ns1}}}; std::filesystem::path p(resolvePath(std::move(path))); mc.AssertWrite(p); if (::utimensat(0, p.c_str(), times.data(), AT_SYMLINK_NOFOLLOW) != 0) { @@ -184,11 +184,12 @@ VolumeServer::utimens(const NetFS::ReqEnv re, std::string path, } NetFS::VFS -VolumeServer::statfs(const NetFS::ReqEnv re, std::string path, const Ice::Current&) +VolumeServer::statfs(const NetFS::ReqEnv re, std::string path, const Ice::Current &) { ModeCheck mc(re, root, userLookup, groupLookup); errno = 0; - struct statvfs s {}; + struct statvfs s { + }; std::filesystem::path p(resolvePath(std::move(path))); mc.AssertRead(p); if (::statvfs(p.c_str(), &s) != 0) { @@ -198,7 +199,7 @@ VolumeServer::statfs(const NetFS::ReqEnv re, std::string path, const Ice::Curren } void -VolumeServer::truncate(const NetFS::ReqEnv re, std::string path, Ice::Long size, const Ice::Current&) +VolumeServer::truncate(const NetFS::ReqEnv re, std::string path, Ice::Long size, const Ice::Current &) { ModeCheck mc(re, root, userLookup, groupLookup); errno = 0; @@ -210,7 +211,7 @@ VolumeServer::truncate(const NetFS::ReqEnv re, std::string path, Ice::Long size, } void -VolumeServer::unlink(const NetFS::ReqEnv re, std::string path, const Ice::Current&) +VolumeServer::unlink(const NetFS::ReqEnv re, std::string path, const Ice::Current &) { ModeCheck mc(re, root, userLookup, groupLookup); errno = 0; @@ -235,8 +236,8 @@ VolumeServer::open(const NetFS::ReqEnv re, std::string path, Ice::Int flags, con if (fd == -1) { throw NetFS::SystemError(errno); } - return Ice::uncheckedCast<NetFS::FilePrx>(ice.adapter->addFacetWithUUID( - std::make_shared<FileServer>(fd, converter), "v01")); + return Ice::uncheckedCast<NetFS::FilePrx>( + ice.adapter->addFacetWithUUID(std::make_shared<FileServer>(fd, converter), "v01")); } NetFS::FilePrxPtr @@ -255,8 +256,8 @@ VolumeServer::create(const NetFS::ReqEnv re, std::string path, Ice::Int flags, I ::unlink(p.c_str()); throw NetFS::SystemError(errno); } - return Ice::uncheckedCast<NetFS::FilePrx>(ice.adapter->addFacetWithUUID( - std::make_shared<FileServer>(fd, converter), "v01")); + return Ice::uncheckedCast<NetFS::FilePrx>( + ice.adapter->addFacetWithUUID(std::make_shared<FileServer>(fd, converter), "v01")); } NetFS::DirectoryPrxPtr @@ -270,12 +271,12 @@ VolumeServer::opendir(const NetFS::ReqEnv re, std::string path, const Ice::Curre if (!od) { throw NetFS::SystemError(errno); } - return Ice::uncheckedCast<NetFS::DirectoryPrx>(ice.adapter->addWithUUID( - std::make_shared<DirectoryServer>(od, converter))); + return Ice::uncheckedCast<NetFS::DirectoryPrx>( + ice.adapter->addWithUUID(std::make_shared<DirectoryServer>(od, converter))); } void -VolumeServer::mkdir(const NetFS::ReqEnv re, std::string path, Ice::Int mode, const Ice::Current&) +VolumeServer::mkdir(const NetFS::ReqEnv re, std::string path, Ice::Int mode, const Ice::Current &) { ModeCheck mc(re, root, userLookup, groupLookup); errno = 0; @@ -291,7 +292,7 @@ VolumeServer::mkdir(const NetFS::ReqEnv re, std::string path, Ice::Int mode, con } void -VolumeServer::rmdir(const NetFS::ReqEnv re, std::string path, const Ice::Current&) +VolumeServer::rmdir(const NetFS::ReqEnv re, std::string path, const Ice::Current &) { ModeCheck mc(re, root, userLookup, groupLookup); errno = 0; @@ -306,7 +307,7 @@ std::filesystem::path normalizedAppend(std::filesystem::path out, const std::filesystem::path && in) { unsigned int depth = 0; - for(const auto & e : in) { + for (const auto & e : in) { if (e.empty() || e == "." || e == "/") { continue; } @@ -330,4 +331,3 @@ VolumeServer::resolvePath(std::string && path) const { return normalizedAppend(root, std::move(path)); } - |