drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 6 Activity

[ox/fs] Fix Directory::mkdir

Browse Source
This commit is contained in:
Gary Talent 2018-10-21 07:19:40 -05:00
parent 0ba964a475
commit 4b70330710
1 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
deps/ox/src/ox/fs/filesystem2/directory.hpp vendored
View File

@ -112,7 +112,9 @@ class Directory {
Error remove(PathIterator it, FileName *nameBuff = nullptr) noexcept; Error remove(PathIterator it, FileName *nameBuff = nullptr) noexcept;
ValErr<typename FileStore::InodeId_t> find(const FileName &name) const noexcept; ValErr<typename FileStore::InodeId_t> findEntry(const FileName &name) const noexcept;
ValErr<typename FileStore::InodeId_t> find(PathIterator name, FileName *nameBuff = nullptr) const noexcept;
}; };
@ -152,7 +154,7 @@ Error Directory<FileStore, InodeId_t>::mkdir(PathIterator path, bool parents, Fi
// determine if already exists // determine if already exists
auto name = nameBuff; auto name = nameBuff;
path.get(name); path.get(name);
auto childInode = find(*name); auto childInode = find(name->c_str());
if (!childInode.ok()) { if (!childInode.ok()) {
// if this is not the last item in the path and parents is disabled, // if this is not the last item in the path and parents is disabled,
// return an error // return an error
@ -198,11 +200,11 @@ Error Directory<FileStore, InodeId_t>::write(PathIterator path, InodeId_t inode,
oxTrace("ox::fs::Directory::write") << "Attempting to write to next sub-Directory"; oxTrace("ox::fs::Directory::write") << "Attempting to write to next sub-Directory";
oxReturnError(path.get(name)); oxReturnError(path.get(name));
nextChild = find(*name); nextChild = findEntry(*name);
if (!nextChild && parents) { if (!nextChild && parents) {
oxReturnError(Directory(m_fs, nextChild).init()); oxReturnError(Directory(m_fs, nextChild).init());
nextChild = find(*name); nextChild = findEntry(*name);
} else { } else {
return OxError(1); return OxError(1);
} }
@ -285,30 +287,56 @@ Error Directory<FileStore, InodeId_t>::remove(PathIterator path, FileName *nameB
} }
template<typename FileStore, typename InodeId_t> template<typename FileStore, typename InodeId_t>
ValErr<typename FileStore::InodeId_t> Directory<FileStore, InodeId_t>::find(const FileName &name) const noexcept { ValErr<typename FileStore::InodeId_t> Directory<FileStore, InodeId_t>::findEntry(const FileName &name) const noexcept {
oxTrace("ox::fs::Directory::find") << name.c_str(); oxTrace("ox::fs::Directory::findEntry") << name.c_str();
auto buff = m_fs->read(m_inodeId).template to<Buffer>(); auto buff = m_fs->read(m_inodeId).template to<Buffer>();
if (buff.valid()) { if (buff.valid()) {
oxTrace("ox::fs::Directory::find") << "Found directory buffer."; oxTrace("ox::fs::Directory::findEntry") << "Found directory buffer.";
for (auto i = buff->iterator(); i.valid(); i.next()) { for (auto i = buff->iterator(); i.valid(); i.next()) {
auto data = i->data(); auto data = i->data();
if (data.valid()) { if (data.valid()) {
oxTrace("ox::fs::Directory::find").del("") << "Comparing \"" << name.c_str() << "\" to \"" << data->name << "\""; oxTrace("ox::fs::Directory::findEntry").del("") << "Comparing \"" << name.c_str() << "\" to \"" << data->name << "\"";
if (ox_strncmp(data->name, name.c_str(), name.len()) == 0) { if (ox_strncmp(data->name, name.c_str(), name.len()) == 0) {
return static_cast<InodeId_t>(data->inode); return static_cast<InodeId_t>(data->inode);
} }
} else { } else {
oxTrace("ox::fs::Directory::find") << "INVALID DIRECTORY ENTRY"; oxTrace("ox::fs::Directory::findEntry") << "INVALID DIRECTORY ENTRY";
} }
} }
oxTrace("ox::fs::Directory::find::fail"); oxTrace("ox::fs::Directory::findEntry::fail");
return {0, OxError(1)}; return {0, OxError(1)};
} else { } else {
oxTrace("ox::fs::Directory::find::fail") << "Could not find directory buffer"; oxTrace("ox::fs::Directory::findEntry::fail") << "Could not findEntry directory buffer";
return {0, OxError(2)}; return {0, OxError(2)};
} }
} }
template<typename FileStore, typename InodeId_t>
ValErr<typename FileStore::InodeId_t> Directory<FileStore, InodeId_t>::find(PathIterator path, FileName *nameBuff) const noexcept {
// reuse nameBuff if it has already been allocated, as it is a rather large variable
if (nameBuff == nullptr) {
nameBuff = reinterpret_cast<FileName*>(ox_alloca(sizeof(FileName)));
}
// determine if already exists
auto name = nameBuff;
if (path.get(name)) {
return {0, OxError(1)};
}
auto v = findEntry(name->c_str());
if (!v.error) {
return v;
}
name = nullptr;
v = find(path + 1, nameBuff);
if (!v.error) {
return v;
}
return {0, OxError(1)};
}
extern template class Directory<FileStore16, uint16_t>; extern template class Directory<FileStore16, uint16_t>;
extern template class Directory<FileStore32, uint32_t>; extern template class Directory<FileStore32, uint32_t>;