Changeset 12947

Timestamp:

10/03/10 21:39:43 (13 years ago)

Author:

ehuelsmann

Message:

Fix ZIP on Windows; in some ABCL lisp tests, it thinks we're trying
to add the same entry multiple times, because it doesn't recognize
the directories. (We use forward slashes as component separators now.)

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Pathname.java (modified) (1 diff)
• zip.java (modified) (1 diff)

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

@@ -52 +52 @@
 
 public class Pathname extends LispObject {
+
+    /** The path component separator used by internally generated
+     * path namestrings.
+     */
+    public final static char separator = '/';
 
     protected LispObject host = NIL;

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

@@ -131 +131 @@
                   int i = 0;
                   int j;
-                  while ((j = d.indexOf(File.separator, i)) != -1) {
+                  while ((j = d.indexOf(Pathname.separator, i)) != -1) {
                     i = j + 1;
-                    directory = d.substring(0, j).replace(File.separatorChar, '/') + "/";
+                    directory = d.substring(0, j) + Pathname.separator;
                     if (!directories.contains(directory)) {
                       directories.add(directory);