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

Fix readDirectory use the right type of directory

Browse Source
This commit is contained in:
Gary Talent 2017-05-12 16:26:59 -05:00
parent 00810e9341
commit 12d3513a50
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deps/ox/src/ox/fs/filesystem.hpp vendored
View File

@ -157,18 +157,18 @@ int Directory<InodeId_t, FsSize_t>::rmFile(const char *name) {
template<typename InodeId_t, typename FsSize_t> template<typename InodeId_t, typename FsSize_t>
int Directory<InodeId_t, FsSize_t>::copy(Directory<uint64_t, uint64_t> *dirOut) { int Directory<InodeId_t, FsSize_t>::copy(Directory<uint64_t, uint64_t> *dirOut) {
auto current = files(); auto current = files();
auto dirBuff = (uint8_t*) dirOut; auto dirOutBuff = (uint8_t*) dirOut;
dirBuff += sizeof(Directory<uint64_t, uint64_t>); dirOutBuff += sizeof(Directory<uint64_t, uint64_t>);
dirOut->size = this->size; dirOut->size = this->size;
dirOut->children = this->children; dirOut->children = this->children;
if (current) { if (current) {
for (uint64_t i = 0; i < this->children; i++) { for (uint64_t i = 0; i < this->children; i++) {
auto entry = (DirectoryEntry<uint64_t>*) dirBuff; auto entry = (DirectoryEntry<uint64_t>*) dirOutBuff;
entry->inode = current->inode; entry->inode = current->inode;
entry->setName(current->getName()); entry->setName(current->getName());
current = (DirectoryEntry<InodeId_t>*) (((uint8_t*) current) + current->size()); current = (DirectoryEntry<InodeId_t>*) (((uint8_t*) current) + current->size());
dirBuff += entry->size(); dirOutBuff += entry->size();
} }
return 0; return 0;
} else { } else {
@ -797,7 +797,7 @@ int FileSystemTemplate<FileStore, FS_TYPE>::readDirectory(const char *path, Dire
auto dirStat = stat(inode); auto dirStat = stat(inode);
auto dirBuffLen = dirStat.size; auto dirBuffLen = dirStat.size;
uint8_t dirBuff[dirBuffLen]; uint8_t dirBuff[dirBuffLen];
auto dir = (Directory<uint64_t, uint64_t>*) dirBuff; auto dir = (Directory<typename FileStore::InodeId_t, typename FileStore::FsSize_t>*) dirBuff;
err = read(dirStat.inode, dirBuff, dirBuffLen); err = read(dirStat.inode, dirBuff, dirBuffLen);
if (!err) { if (!err) {