Ensure directory wildcards avoid reading files.

Previously a wildcard like */* run on a tree like

 - foo
 - bar/
   - baz

would return an `Err` for `foo`, since it was trying to read it as a
directory.

Fixes #29.

Author: huonw

src/lib.rs

@@ -706,7 +706,7 @@ fn fill_todo(todo: &mut Vec<Result<(Path, usize), GlobError>>, patterns: &[Patte
     };
 
     let pattern = &patterns[idx];
-
+    let is_dir = path.is_dir();
     match pattern_as_str(pattern) {
         Some(s) => {
             // This pattern component doesn't have any metacharacters, so we
@@ -716,11 +716,11 @@ fn fill_todo(todo: &mut Vec<Result<(Path, usize), GlobError>>, patterns: &[Patte
             // right away.
             let special = "." == s.as_slice() || ".." == s.as_slice();
             let next_path = path.join(s.as_slice());
-            if (special && path.is_dir()) || (!special && next_path.exists()) {
+            if (special && is_dir) || (!special && next_path.exists()) {
                 add(todo, next_path);
             }
         },
-        None => {
+        None if is_dir => {
             match fs::readdir(path) {
               Ok(mut children) => {
                   children.sort_by(|p1, p2| p2.filename().cmp(&p1.filename()));
@@ -743,6 +743,7 @@ fn fill_todo(todo: &mut Vec<Result<(Path, usize), GlobError>>, patterns: &[Patte
               },
             }
         }
+        None => {/* not a directory, nothing more to find */}
     }
 }
 

tests/glob-std.rs

@@ -39,7 +39,7 @@ fn main() {
     }
 
     fn glob_vec(pattern: &str) -> Vec<Path> {
-        glob(pattern).unwrap().filter_map(|r| r.ok()).collect()
+        glob(pattern).unwrap().map(|r| r.unwrap()).collect()
     }
 
     let root = TempDir::new("glob-tests");