[armedbear-cvs] r13677 - trunk/abcl/src/org/armedbear/lisp

[vvoutilainen at common-lisp.net]

Author: vvoutilainen
Date: Tue Oct 25 06:29:23 2011
New Revision: 13677

Log:
Fix #179: LIST-DIRECTORY ignores :RESOLVE-SYMLINKS flag?

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

Modified: trunk/abcl/src/org/armedbear/lisp/Pathname.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Pathname.java	Mon Oct 24 23:22:03 2011	(r13676)
+++ trunk/abcl/src/org/armedbear/lisp/Pathname.java	Tue Oct 25 06:29:23 2011	(r13677)
@@ -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());