Changeset 12667

Timestamp:

05/11/10 14:45:53 (13 years ago)

Author:

Mark Evenson

Message:

Fix WILD-PATHNAME-P to check for pathname components which are strings containing "*".

Not working for pathnames whose HOST or DEVICE containing "*".

File:

• trunk/abcl/src/org/armedbear/lisp/Pathname.java (modified) (1 diff)

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

@@ -1673 +1673 @@
                 return true;
             }
+            Cons d = (Cons) directory;
+            while (true) {
+                if (d.car() instanceof AbstractString) {
+                    String s = d.car().writeToString();
+                    if (s.contains("*")) {
+                        return true;
+                    }
+                }
+                if (d.cdr() == NIL || ! (d.cdr() instanceof Cons)) {
+                    break;
+                }
+                d = (Cons)d.cdr();
+            }
         }
         if (name == Keyword.WILD || name == Keyword.WILD_INFERIORS) {
             return true;
         }
+        if (name instanceof AbstractString) {
+            if (name.writeToString().contains("*")) {
+                return true;
+            }
+        }
         if (type == Keyword.WILD || type == Keyword.WILD_INFERIORS) {
             return true;
+        }
+        if (type instanceof AbstractString) {
+            if (type.writeToString().contains("*")) {
+                return true;
+            }
         }
         if (version == Keyword.WILD || version == Keyword.WILD_INFERIORS) {