drinkingtea/ox
2
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

Merge branch 'master' of github.com:wombatant/ox

Browse Source
This commit is contained in:
Gary Talent
2017-09-09 19:33:05 -05:00
parent 84533e557e 916d07e530
commit 4887d55a98
1 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ox/fs/filesystem.hpp
+32 -23
View File
@@ -43,6 +43,11 @@ struct DirectoryListing {
} }
}; };
template<typename String>
bool operator<(const DirectoryListing<String> &a, const DirectoryListing<String> &b) {
return a.name < b.name;
}
template<typename InodeId_t> template<typename InodeId_t>
struct __attribute__((packed)) DirectoryEntry { struct __attribute__((packed)) DirectoryEntry {
InodeId_t inode; InodeId_t inode;
@@ -380,32 +385,36 @@ int FileSystemTemplate<FileStore, FS_TYPE>::stripDirectories() {
template<typename FileStore, FsType FS_TYPE> template<typename FileStore, FsType FS_TYPE>
int FileSystemTemplate<FileStore, FS_TYPE>::mkdir(const char *path) { int FileSystemTemplate<FileStore, FS_TYPE>::mkdir(const char *path) {
Directory<typename FileStore::InodeId_t, typename FileStore::FsSize_t> dir; if (!stat(path).inode) {
auto err = write(path, &dir, sizeof(dir), FileType::FileType_Directory); Directory<typename FileStore::InodeId_t, typename FileStore::FsSize_t> dir;
if (err) { auto err = write(path, &dir, sizeof(dir), FileType::FileType_Directory);
return err; if (err) {
} return err;
}
// add . entry for self // add . entry for self
auto inode = findInodeOf(path); auto inode = findInodeOf(path);
err = insertDirectoryEntry(path, ".", inode); err = insertDirectoryEntry(path, ".", inode);
if (err) { if (err) {
remove(inode); remove(inode);
return err; return err;
} }
// add .. entry for parent // add .. entry for parent
size_t pathLen = ox_strlen(path); size_t pathLen = ox_strlen(path);
char dirPath[pathLen]; char dirPath[pathLen];
PathIterator pathReader(path, pathLen); PathIterator pathReader(path, pathLen);
err |= pathReader.dirPath(dirPath, pathLen); err |= pathReader.dirPath(dirPath, pathLen);
err = insertDirectoryEntry(path, "..", findInodeOf(dirPath)); err = insertDirectoryEntry(path, "..", findInodeOf(dirPath));
if (err) { if (err) {
remove(inode); remove(inode);
return err; return err;
} }
return err; return err;
} else {
return 1;
}
} }
template<typename FileStore, FsType FS_TYPE> template<typename FileStore, FsType FS_TYPE>