From 83e6e3e31f2ebf8d7777cdf7e4131996ab94c4a4 Mon Sep 17 00:00:00 2001 From: Denis Krjuchkov Date: Thu, 5 Dec 2013 04:25:57 +0600 Subject: fs/Traits.cxx: don't return empty string if parent dir is root --- src/fs/Traits.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/fs') diff --git a/src/fs/Traits.cxx b/src/fs/Traits.cxx index 47feda25b..7dd8d20b6 100644 --- 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); } -- cgit v1.2.3