[#75] fix(Vfs): allow trailing whitespace in find and resolve

GothicKit · Jul 26, 2023 · 9e8458e · 9e8458e
1 parent 97b7cba
commit 9e8458e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/source/Vfs.cc b/source/Vfs.cc
@@ -43,8 +43,18 @@ namespace phoenix {
 		return std::get<std::vector<VfsNode>>(_m_data);
 	}
 
+	std::string_view trim_trailing_whitespace(std::string_view s) {
+		while (std::isspace(s.back())) {
+			s = s.substr(0, s.size() - 1);
+		}
+
+		return s;
+	}
+
 	VfsNode const* VfsNode::child(std::string_view name) const {
 		auto& children = std::get<std::vector<VfsNode>>(_m_data);
+
+		name = trim_trailing_whitespace(name);
 		auto it = std::lower_bound(children.begin(), children.end(), name, VfsNodeComparator {});
 		if (it == children.end() || !iequals(it->name(), name))
 			return nullptr;
@@ -53,6 +63,8 @@ namespace phoenix {
 
 	VfsNode* VfsNode::child(std::string_view name) {
 		auto& children = std::get<std::vector<VfsNode>>(_m_data);
+
+		name = trim_trailing_whitespace(name);
 		auto it = std::lower_bound(children.begin(), children.end(), name, VfsNodeComparator {});
 		if (it == children.end() || !iequals(it->name(), name))
 			return nullptr;
@@ -68,6 +80,8 @@ namespace phoenix {
 
 	bool VfsNode::remove(std::string_view name) {
 		auto& children = std::get<std::vector<VfsNode>>(_m_data);
+
+		name = trim_trailing_whitespace(name);
 		auto it = std::lower_bound(children.begin(), children.end(), name, VfsNodeComparator {});
 		if (it == children.end() || !iequals(it->name(), name))
 			return false;
@@ -408,4 +422,4 @@ namespace phoenix {
 		}
 	}
 
-} // namespace phoenix
+} // namespace phoenix
diff --git a/tests/TestVfs.cc b/tests/TestVfs.cc
@@ -53,6 +53,10 @@ void check_vfs(Vfs const& vdf) {
 	CHECK_NE(vdf.resolve("/LICENSES"), nullptr);
 	CHECK_NE(vdf.resolve(""), nullptr);
 	CHECK_NE(vdf.resolve("/"), nullptr);
+
+	// Ignores trailing whitespace (see #75)
+	CHECK_NE(vdf.find("config.yml "), nullptr);
+	CHECK_NE(vdf.resolve("licEnSES /GPL/gpl-3.0.md "), nullptr);
 }
 
 TEST_SUITE("Vfs") {