Quellcode durchsuchen

whoops, fix relative filenames

David Rose vor 16 Jahren
Ursprung
Commit
16636129b7
1 geänderte Dateien mit 9 neuen und 2 gelöschten Zeilen
  1. 9 2
      dtool/src/dtoolutil/filename.cxx

+ 9 - 2
dtool/src/dtoolutil/filename.cxx

@@ -921,8 +921,15 @@ standardize() {
       // Ignore /./.
       // Ignore /./.
     } else if (component == ".." && !components.empty() &&
     } else if (component == ".." && !components.empty() &&
                !(components.back() == "..")) {
                !(components.back() == "..")) {
-      // Back up.
-      components.pop_back();
+      if (components.back() == ".") {
+        // To "back up" over a leading ./ means simply to remove the
+        // leading ./
+        components.pop_back();
+        components.push_back(component);
+      } else {
+        // Back up normally.
+        components.pop_back();
+      }
     } else {
     } else {
       components.push_back(component);
       components.push_back(component);
     }
     }