[armedbear-cvs] r13681 - branches/1.0.x/abcl/src/org/armedbear/lisp

[mevenson at common-lisp.net]

Author: mevenson
Date: Thu Oct 27 23:18:44 2011
New Revision: 13681

Log:
Backport r13677: Fix #179: LIST-DIRECTORY ignores :RESOLVE-SYMLINKS flag.

Modified:
   branches/1.0.x/abcl/src/org/armedbear/lisp/Pathname.java

Modified: branches/1.0.x/abcl/src/org/armedbear/lisp/Pathname.java
==============================================================================
--- branches/1.0.x/abcl/src/org/armedbear/lisp/Pathname.java	Thu Oct 27 06:28:49 2011	(r13680)
+++ branches/1.0.x/abcl/src/org/armedbear/lisp/Pathname.java	Thu Oct 27 23:18:44 2011	(r13681)
@@ -1623,7 +1623,11 @@
                             File file = files[i];
                             Pathname p;
                             if (file.isDirectory()) {
-                                p = Utilities.getDirectoryPathname(file);
+                                if (arg2 != NIL) {
+                                    p = Utilities.getDirectoryPathname(file);
+                                } else {
+                                    p = new Pathname(file.getAbsolutePath()); 
+                                }
                             } else {
                                 if (arg2 != NIL) {
                                     p = new Pathname(file.getCanonicalPath());