Changeset 12947 for trunk/abcl/src/org


Ignore:
Timestamp:
10/03/10 21:39:43 (11 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/Pathname.java

    r12810 r12947  
    5252
    5353public class Pathname extends LispObject {
     54
     55    /** The path component separator used by internally generated
     56     * path namestrings.
     57     */
     58    public final static char separator = '/';
    5459
    5560    protected LispObject host = NIL;
  • trunk/abcl/src/org/armedbear/lisp/zip.java

    r12402 r12947  
    131131                  int i = 0;
    132132                  int j;
    133                   while ((j = d.indexOf(File.separator, i)) != -1) {
     133                  while ((j = d.indexOf(Pathname.separator, i)) != -1) {
    134134                    i = j + 1;
    135                     directory = d.substring(0, j).replace(File.separatorChar, '/') + "/";
     135                    directory = d.substring(0, j) + Pathname.separator;
    136136                    if (!directories.contains(directory)) {
    137137                      directories.add(directory);
Note: See TracChangeset for help on using the changeset viewer.