Changeset 15446

Timestamp:

10/29/20 16:54:42 (2 years ago)

Author:

Mark Evenson

Message:

Create JAR-PATHNAME from strings with correct type

File:

• trunk/abcl/src/org/armedbear/lisp/JarPathname.java (modified) (2 diffs)

trunk/abcl/src/org/armedbear/lisp/JarPathname.java

@@ -75 +75 @@
       rootDevice.copyFrom(p);
     } else if (p instanceof Pathname) {
-      // FIXME: not going to work with namestrings with characters
-      // that need URI escaping
-      rootDevice.copyFrom(p);
+      rootDevice = URLPathname.create(p);
     } else {
       simple_error("Argument is already a JAR-PATHNAME: ~a", p);
@@ -197 +195 @@
 
     // Normalize the root jar to be a URL
+    URLPathname rootPathname;
     String rootNamestring = contents.get(0);
     if (!isValidURL(rootNamestring)) {
-      rootNamestring = "file:" + rootNamestring;
-    }
-
-    URLPathname rootPathname = (URLPathname)URLPathname.create(rootNamestring);
+      Pathname root = Pathname.create(rootNamestring);
+      rootPathname = URLPathname.createFromFile(root);
+    } else {
+      rootPathname = URLPathname.create(rootNamestring);
+    }
 
     LispObject jars = NIL;