hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Return better fuse errors

Browse Source
This commit is contained in:
Sebastian Messmer 2015-09-30 14:27:29 +02:00
parent 752be4415c
commit 37f7c764d1
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/filesystem/CryDevice.cpp
View File

@ -83,22 +83,27 @@ optional<unique_ref<fspp::Node>> CryDevice::Load(const bf::path &path) {
unique_ref<DirBlob> CryDevice::LoadDirBlob(const bf::path &path) { unique_ref<DirBlob> CryDevice::LoadDirBlob(const bf::path &path) {
auto blob = LoadBlob(path); auto blob = LoadBlob(path);
auto dir = dynamic_pointer_move<DirBlob>(blob); auto dir = dynamic_pointer_move<DirBlob>(blob);
ASSERT(dir != none, "Loaded blob is not a directory"); if (dir == none) {
throw FuseErrnoException(ENOTDIR); // Loaded blob is not a directory
}
return std::move(*dir); return std::move(*dir);
} }
unique_ref<FsBlob> CryDevice::LoadBlob(const bf::path &path) { unique_ref<FsBlob> CryDevice::LoadBlob(const bf::path &path) {
auto currentBlob = _fsBlobStore->load(_rootKey); auto currentBlob = _fsBlobStore->load(_rootKey);
//TODO Return correct fuse error
ASSERT(currentBlob != none, "rootDir not found"); ASSERT(currentBlob != none, "rootDir not found");
for (const bf::path &component : path.relative_path()) { for (const bf::path &component : path.relative_path()) {
auto currentDir = dynamic_pointer_move<DirBlob>(*currentBlob); auto currentDir = dynamic_pointer_move<DirBlob>(*currentBlob);
ASSERT(currentDir != none, "Path component is not a dir"); if (currentDir == none) {
throw FuseErrnoException(ENOTDIR); // Path component is not a dir
}
Key childKey = (*currentDir)->GetChild(component.c_str()).key; Key childKey = (*currentDir)->GetChild(component.c_str()).key;
currentBlob = _fsBlobStore->load(childKey); currentBlob = _fsBlobStore->load(childKey);
ASSERT(currentBlob != none, "Blob for directory entry not found"); if (currentBlob == none) {
throw FuseErrnoException(ENOENT); // Blob for directory entry not found
}
} }
return std::move(*currentBlob); return std::move(*currentBlob);