Try harder to make Dirs end with '/'

bradneuman · Sep 21, 2013 · 9149c1d · 9149c1d
1 parent 569520f
commit 9149c1d
Showing 1 changed file with 17 additions and 12 deletions.
diff --git a/rct/Path.cpp b/rct/Path.cpp
@@ -163,23 +163,28 @@ bool Path::resolve(ResolveMode mode, const Path &cwd)
             return true;
         }
         return false;
-    } else {
-        if (!cwd.isEmpty() && !isAbsolute()) {
-            Path copy = cwd + '/' + *this;
-            if (copy.resolve(RealPath)) {
-                operator=(copy);
-                return true;
-            }
+    }
+
+    if (!cwd.isEmpty() && !isAbsolute()) {
+        Path copy = cwd + '/' + *this;
+        if (copy.resolve(RealPath)) {
+            operator=(copy);
+            return true;
         }
+    }
 
-        {
-            char buffer[PATH_MAX + 2];
-            if (realpath(constData(), buffer)) {
-                String::operator=(buffer);
-                return true;
+    {
+        char buffer[PATH_MAX + 2];
+        if (realpath(constData(), buffer)) {
+            if (isDir()) {
+                assert(buffer[strlen(buffer)] != '/');
+                buffer[strlen(buffer)] = '/';
             }
+            String::operator=(buffer);
+            return true;
         }
     }
+
     return false;
 }