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

[Ville Voutilainen]

Author: vvoutilainen
Date: Wed Mar 16 14:36:39 2011
New Revision: 13252

Log:
Revert the fix attempt for files with names like File::Foo::Bar.
It breaks normal directory listings.


Modified:
   trunk/abcl/src/org/armedbear/lisp/directory.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/directory.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/directory.lisp	(original)
+++ trunk/abcl/src/org/armedbear/lisp/directory.lisp	Wed Mar 16 14:36:39 2011
@@ -116,9 +116,9 @@
                       (matching-entries ()))
                   (dolist (entry entries)
                     (cond ((file-directory-p entry)
-                           (when (pathname-match-p (make-pathname :name (file-namestring (pathname-as-file entry))) (make-pathname :name (file-namestring pathname)))
+                           (when (pathname-match-p (file-namestring (pathname-as-file entry)) (file-namestring pathname))
                              (push entry matching-entries)))
-                          ((pathname-match-p (make-pathname :name (or (file-namestring entry) "")) (make-pathname :name (file-namestring pathname)))
+                          ((pathname-match-p (or (file-namestring entry) "") (file-namestring pathname))
                            (push entry matching-entries))))
                   matching-entries))))
         ;; Not wild.