Pathnames whose namestring start with "./" have :RELATIVE directory

fixes <#666>.
armedbear · Apr 29, 2024 · 8bb5ded · 8bb5ded
1 parent f49689c
commit 8bb5ded
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/org/armedbear/lisp/Pathname.java b/src/org/armedbear/lisp/Pathname.java
@@ -296,8 +296,6 @@ private static final Pathname init(String s) {
       result.setDirectory(new Cons(Keyword.RELATIVE));
       return result;
     } 
-    if (s.startsWith("./"))
-      { s = s.substring(2); }
     if (s.equals("..") || s.equals("../")) {
       result.setDirectory(list(Keyword.RELATIVE, Keyword.UP));
       return result;
@@ -425,6 +423,9 @@ private static final LispObject parseDirectory(String d) {
         if (d.equals("/") || (Utilities.isPlatformWindows && d.equals("\\"))) {
             return new Cons(Keyword.ABSOLUTE);
         }
+        if (d.equals("./")) {
+            return new Cons(Keyword.RELATIVE);
+        }
         LispObject result;
         if (d.startsWith("/") || (Utilities.isPlatformWindows && d.startsWith("\\"))) {
             result = new Cons(Keyword.ABSOLUTE);