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

[ox/fs] Fix -p write

Browse Source
This commit is contained in:
Gary Talent 2018-09-01 01:56:20 -05:00
parent 9472043d80
commit e4e8f141b6
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,6 +103,9 @@ class Directory {
Error mkdir(PathIterator path, bool parents, FileName *nameBuff = nullptr); Error mkdir(PathIterator path, bool parents, FileName *nameBuff = nullptr);
/**
* @param parents indicates the operation should create non-existent directories in the path, like mkdir -p
*/
Error write(PathIterator it, InodeId_t inode, bool parents = false, FileName *nameBuff = nullptr) noexcept; Error write(PathIterator it, InodeId_t inode, bool parents = false, FileName *nameBuff = nullptr) noexcept;
Error remove(PathIterator it, FileName *nameBuff = nullptr) noexcept; Error remove(PathIterator it, FileName *nameBuff = nullptr) noexcept;
@ -195,13 +198,18 @@ Error Directory<InodeId_t>::write(PathIterator path, InodeId_t inode, bool paren
oxReturnError(path.get(name)); oxReturnError(path.get(name));
nextChild = find(*name); nextChild = find(*name);
if (!nextChild && parents) {
oxReturnError(Directory(m_fs, nextChild).init());
nextChild = find(*name);
} else {
return OxError(1);
}
if (nextChild) { if (nextChild) {
// reuse name because it is a rather large variable and will not be used again // reuse name because it is a rather large variable and will not be used again
// be attentive that this remains true // be attentive that this remains true
name = nullptr; name = nullptr;
return Directory(m_fs, nextChild).write(path + 1, inode, parents, nameBuff); return Directory(m_fs, nextChild).write(path + 1, inode, parents, nameBuff);
} else if (parents) {
Directory(m_fs, nextChild).init();
} }
} else { } else {
// insert the new entry on this directory // insert the new entry on this directory