Changeset 15411

Timestamp:

10/14/20 07:07:20 (3 years ago)

Author:

Mark Evenson

Message:

FILE-DELETE for pathnames for ZipCache? items now works

Construct from JAR-PATHNAME from PATHNAME with proper type.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

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

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

@@ -70 +70 @@
   public static JarPathname createFromPathname(Pathname p) {
     JarPathname result = new JarPathname();
-    Pathname rootDevice = new Pathname();
+    URLPathname rootDevice = new URLPathname();
 
     if (p instanceof URLPathname) {
@@ -77 +77 @@
       // FIXME: not going to work with namestrings with characters
       // that need URI escaping
-      URLPathname r = new URLPathname();
-      r.copyFrom(p);
-      rootDevice = r;
+      rootDevice.copyFrom(p);
     } else {
       simple_error("Argument is already a JAR-PATHNAME: ~a", p);

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

@@ -559 +559 @@
     }
   }
+
+  synchronized public static boolean remove(Pathname pathname) {
+    JarPathname p = JarPathname.createFromPathname(pathname);
+    return remove(p);
+  }
       
   synchronized public static boolean remove(JarPathname p) {
-    Archive archive = cache.get(p.getNamestring());
+    Archive archive = cache.get(p);
     if (archive != null) {
       archive.close();

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

@@ -85 +85 @@
       if (file.exists()) {
         // File exists.
-        for (int i = 0; i < 5; i++) {
-          if (file.delete())
+        for (int i = 0; i < 2; i++) {
+          if (file.delete()) {
             return T;
+    }
+    // Under Windows our fasls get placed in the ZipCache when compiled
+    ZipCache.remove(defaultedPathname);
           System.gc();
           Thread.yield();