Changeset 15452

Timestamp:

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

Author:

Mark Evenson

Message:

Construct the keys for ZipCache? entries without namestrings

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• JarPathname.java (modified) (2 diffs)
• Pathname.java (modified) (1 diff)
• ZipCache.java (modified) (1 diff)

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

@@ -113 +113 @@
       return (JarPathname)UNREACHED;
     }
-    return JarPathname.create(jar.getNamestring() + entry);
+    JarPathname result = new JarPathname();
+    result.copyFrom(jar);
+    String path = new String(entry);
+    if (!path.startsWith("/")) {
+      path = "/" + path;
+    }
+    Pathname p = Pathname.create(path);
+    result
+      .setDirectory(p.getDirectory())
+      .setName(p.getName())
+      .setType(p.getType());
+    
+    return result;
   }
   /** 
@@ -365 +377 @@
     if (p.isLocalFile()) {
       Pathname rootJar;
-      if (URLPathname.hasExplicitFile(p)) {
+      if (URLPathname.hasExplicitFile((Pathname)p.getRootJar())) {
         rootJar = new URLPathname();
       } else {

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

@@ -2186 +2186 @@
     result.append(path);
 
-    // Entries in jar files are always relative, but Pathname
-    // directories are :ABSOLUTE.
+    // ZipEntry syntax is always relative
     if (result.length() > 1
         && result.substring(0, 1).equals("/")) {

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

@@ -329 +329 @@
         return null;
       }
-      
+
       entries.put(entryPathname, result);
       return result;