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

2017-09-09 19:33:05 -05:00
parent 84533e557e 916d07e530
commit 4887d55a98
1 changed files with 32 additions and 23 deletions
@@ -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>
 struct __attribute__((packed)) DirectoryEntry {
 	InodeId_t inode;
@@ -380,6 +385,7 @@ int FileSystemTemplate<FileStore, FS_TYPE>::stripDirectories() {

 template<typename FileStore, FsType FS_TYPE>
 int FileSystemTemplate<FileStore, FS_TYPE>::mkdir(const char *path) {
+	if (!stat(path).inode) {
 		Directory<typename FileStore::InodeId_t, typename FileStore::FsSize_t> dir;
 		auto err = write(path, &dir, sizeof(dir), FileType::FileType_Directory);
 		if (err) {
@@ -406,6 +412,9 @@ int FileSystemTemplate<FileStore, FS_TYPE>::mkdir(const char *path) {
 		}

 		return err;
+	} else {
+		return 1;
+	}
 }

 template<typename FileStore, FsType FS_TYPE>