Make dirname behave sensibly for single-component paths

[libs/core.git] / source / utils.cpp

diff --git a/source/utils.cpp b/source/utils.cpp
index a0c2486f17402593b2e48199fc9d689923098809..abe0d2563125d9288dbdb2cdc5c6ee6b291e856f 100644 (file)
--- a/source/utils.cpp
+++ b/source/utils.cpp
@@ -30,6 +30,12 @@ string basename(const Path &p)
 
 Path dirname(const Path &p)
 {
+       if(p.size()==1)
+       {
+               if(p.is_absolute())
+                       return p;
+               return ".";
+       }
        return p.subpath(0, p.size()-1);
 }
 
@@ -82,6 +88,7 @@ Path fix_case(const Path &path)
 Path readlink(const Path &link)
 {
 #ifdef WIN32
+       (void)link;
        throw Exception("No symbolic links on win32");
 #else
        char buf[4096];