Changeset 15403

Timestamp:

10/10/20 21:43:40 (2 years ago)

Author:

Mark Evenson

Message:

Our namestrings should always contain forward-slash delimited directories

We want to convert all Windows backslashes to this format on reading
namestrings, but always emit directories delimited with forward slashes.

TODO move away from using File.pathSeparator???

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Pathname.java (modified) (5 diffs)
• zip.java (modified) (2 diffs)

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

@@ -144 +144 @@
 
 
-  /** The path component separator used by internally generated
+  /** 
+   * The path component separator used by internally generated
    * path namestrings.
    */
-  public final static char separator = '/';
+  public final static char directoryDelimiter = '/';
     
 
@@ -585 +586 @@
         // the namestring." 19.2.2.2.3.1
         if (getDirectory() != NIL && getDirectory() != Keyword.UNSPECIFIC) {
-            final char separatorChar = '/';
             LispObject temp = getDirectory();
             LispObject part = temp.car();
             temp = temp.cdr();
             if (part == Keyword.ABSOLUTE) {
-                sb.append(separatorChar);
+                sb.append(directoryDelimiter);
             } else if (part == Keyword.RELATIVE) {
                 if (temp == NIL) {
                     // #p"./"
                     sb.append('.');
-                    sb.append(separatorChar);
+                    sb.append(directoryDelimiter);
                 }
                 // else: Nothing to do.
@@ -614 +614 @@
                     sb.append("..");
                 }
-                sb.append(separatorChar);
+                sb.append(directoryDelimiter);
                 temp = temp.cdr();
             }
@@ -720 +720 @@
                     if (n.equals(".") || n.equals("..")) {
                         useNamestring = false;
+                        // ??? File.separatorChar is platform dependent.  Does this help on Windows?
                     } else if (n.indexOf(File.separatorChar) >= 0) {
                         useNamestring = false;
@@ -2112 +2113 @@
             String namestring = file.getCanonicalPath();
             if (namestring != null && namestring.length() > 0) {
+              // ??? do we really want the platform dependent separatorChar?
                 if (namestring.charAt(namestring.length() - 1) != File.separatorChar) {
                     namestring = namestring.concat(File.separator);

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

@@ -135 +135 @@
                   int i = 0;
                   int j;
-                  while ((j = d.indexOf(Pathname.separator, i)) != -1) {
+                  while ((j = d.indexOf(Pathname.directoryDelimiter, i)) != -1) {
                     i = j + 1;
-                    directory = d.substring(0, j) + Pathname.separator;
+                    directory = d.substring(0, j) + Pathname.directoryDelimiter;
                     if (!directories.contains(directory)) {
                       directories.add(directory);
@@ -177 +177 @@
             int i = 0;
             int j;
-            while ((j = path.indexOf(Pathname.separator, i)) != -1) {
+            while ((j = path.indexOf(Pathname.directoryDelimiter, i)) != -1) {
                 i = j + 1;
-                final String directory = path.substring(0, j) + Pathname.separator;
+                final String directory = path.substring(0, j) + Pathname.directoryDelimiter;
                 if (!contains(directory)) {
                     add(directory);