Changeset 12797
- Timestamp:
- 07/10/10 20:08:43 (13 years ago)
- Location:
- trunk/abcl/src/org/armedbear/lisp
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/abcl/src/org/armedbear/lisp/Pathname.java
r12780 r12797 607 607 if (host != NIL) { 608 608 Debug.assertTrue(host instanceof AbstractString 609 || isURL());610 if ( isURL()) {609 || host instanceof Cons); 610 if (host instanceof Cons) { 611 611 LispObject scheme = Symbol.GETF.execute(host, SCHEME, NIL); 612 612 LispObject authority = Symbol.GETF.execute(host, AUTHORITY, NIL); … … 632 632 if (device == NIL) { 633 633 } else if (device == Keyword.UNSPECIFIC) { 634 } else if ( isJar()) {634 } else if (device instanceof Cons) { 635 635 LispObject[] jars = ((Cons) device).copyToArray(); 636 636 StringBuilder prefix = new StringBuilder(); … … 644 644 } 645 645 sb = prefix.append(sb); 646 } else if (device instanceof AbstractString 647 && device.getStringValue().startsWith("jar:")) { 648 sb.append(device.getStringValue()); 646 649 } else if (device instanceof AbstractString) { 647 650 sb.append(device.getStringValue()); … … 721 724 } 722 725 namestring = sb.toString(); 723 // XXX Decide ifthis is necessary726 // XXX Decide when this is necessary 724 727 // if (isURL()) { 725 728 // namestring = Utilities.uriEncode(namestring); … … 1234 1237 } catch (IOException e) { 1235 1238 Debug.trace("Failed to make a Pathname from " 1236 + " '" + file + "'");1239 + "." + file + "'"); 1237 1240 return null; 1238 1241 } … … 1288 1291 host = defaults.host; 1289 1292 } 1290 if (directory == NIL ) {1293 if (directory == NIL && defaults != null) { 1291 1294 directory = defaults.directory; 1292 1295 } … … 2082 2085 result = new URL(pathname.getNamestring()); 2083 2086 } else { 2084 // XXX Properly encode Windows drive letters and UNC paths 2085 // XXX ensure that we have cannonical path? 2087 // XXX ensure that we have cannonical path. 2086 2088 result = new URL("file://" + pathname.getNamestring()); 2087 2089 } -
trunk/abcl/src/org/armedbear/lisp/ShellCommand.java
r12513 r12797 236 236 // run-shell-command command &key directory (output *standard-output*) 237 237 // ### %run-shell-command command directory output => exit-code 238 private static final Primitive _RUN_SHELL_COMMAND = 239 new Primitive("%run-shell-command", PACKAGE_SYS, false) 240 { 238 private static final Primitive _RUN_SHELL_COMMAND = new pf_run_shell_command(); 239 private static class pf_run_shell_command extends Primitive { 240 pf_run_shell_command() { 241 super("%run-shell-command", PACKAGE_SYS, false, 242 "command directory output => exit-code"); 243 } 244 241 245 @Override 242 246 public LispObject execute(LispObject first, LispObject second,
Note: See TracChangeset
for help on using the changeset viewer.