fs/Traits.cxx: don't return empty string if parent dir is root

83e6e3e3 · Denis Krjuchkov · c3870312 · 83e6e3e3
Commit 83e6e3e3 authored Dec 05, 2013 by Denis Krjuchkov
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

Traits.cxx src/fs/Traits.cxx +5 -3

No files found.
--- a/src/fs/Traits.cxx
+++ b/src/fs/Traits.cxx
@@ -64,7 +64,9 @@ PathTraitsUTF8::GetParent(PathTraitsUTF8::const_pointer p)
 	assert(p != nullptr);

 	const char *slash = strrchr(p, SEPARATOR);
-	return slash != nullptr
-		? std::string(p, slash)
-		: std::string(".");
+	if (slash == nullptr)
+		return std::string(".");
+	if (slash == p)
+		return std::string(p, p + 1);
+	return std::string(p, slash);
 }