klisp

commit 318e121d3dd1b1d195e01ba18a7b4039905c0b09
parent 2942c824edbcbeab5c3ed775610fde43304737b2
Author: Andres Navarro <canavarro82@gmail.com>
Date:   Wed, 29 Feb 2012 00:15:57 -0300

Added full gc + retry to delete file, to try to fix a Windows bug.

Diffstat:
M
src/kgsystem.c
 | 
17
++++++++++-------

1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/kgsystem.c b/src/kgsystem.c
@@ -17,6 +17,7 @@
 #include "kerror.h"
 #include "ksystem.h"
 #include "kinteger.h"
+#include "kgc.h"
 
 #include "kghelpers.h"
 #include "kgsystem.h"
@@ -102,15 +103,17 @@ void delete_file(klisp_State *K)
 
     /* TEMP: this should probably be done in a operating system specific
        manner, but this will do for now */
-    /* XXX: this could fail if there's a dead (in the gc sense) port still 
-       open, should probably retry once after doing a complete GC */
     if (remove(kstring_buf(filename))) {
-        klispE_throw_errno_with_irritants(K, "remove", 1, filename);
-        return;
-    } else {
-        kapply_cc(K, KINERT);
-        return;
+        /* At least in Windows, this could have failed if there's a dead
+           (in the gc sense) port still open, should retry once after 
+           doing a complete GC. This isn't ideal but... */
+        klispC_fullgc(K);
+        if (remove(kstring_buf(filename))) {
+            klispE_throw_errno_with_irritants(K, "remove", 1, filename);
+            return;
+        }
     }
+    kapply_cc(K, KINERT);
 }
 
 /* 15.1.? rename-file */