Changeset 13474


Ignore:
Timestamp:
08/13/11 05:08:51 (10 years ago)
Author:
Mark Evenson
Message:

Backport r13460: Fix loading from fasls under Windows with whitespace in pathname.

Location:
branches/0.26.x/abcl/src/org/armedbear/lisp
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/0.26.x/abcl/src/org/armedbear/lisp/Load.java

    r13353 r13474  
    159159                    + COMPILE_FILE_INIT_FASL_TYPE;
    160160            } else {
    161                 n = "jar:file:" + n + "!/" + name + "."
     161                n = "jar:file:" + Pathname.uriEncode(n) + "!/" + name + "."
    162162                    + COMPILE_FILE_INIT_FASL_TYPE;
    163163            }
  • branches/0.26.x/abcl/src/org/armedbear/lisp/Pathname.java

    r13358 r13474  
    374374                                    + ": " + ex.toString()));
    375375                }
    376                 final String uriPath = uri.getPath();
     376                String uriPath = uri.getPath();
    377377                if (null == uriPath) {
    378                     error(new LispError("The URI has no path: " + uri));
     378        // We make an exception for forms like "file:z:/foo/path"
     379        uriPath = uri.getSchemeSpecificPart();
     380        if (uriPath == null || uriPath.equals("")) {
     381           error(new LispError("The URI has no path: " + uri));
     382            }
    379383                }
    380384                final File file = new File(uriPath);
Note: See TracChangeset for help on using the changeset viewer.