---

yaml
---
r: 12592
b: refs/heads/master
c: 8688b1b
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 7235f3cee2fd7ceaf697232cd2a2c3b9ceba50ba
+refs/heads/master: 8688b1b845f3ceede2a62da6a2fc2256e6bcfd2a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libcore/os.rs

@@ -34,6 +34,7 @@ export homedir, list_dir, list_dir_path, path_is_dir, path_exists,
        copy_file;
 export last_os_error;
 export set_exit_status;
+export walk_dir;
 
 // FIXME: move these to str perhaps?
 export as_c_charp, fill_charp_buf;
@@ -387,7 +388,34 @@ fn homedir() -> option<path> {
     }
 }
 
+#[doc = "Recursively walk a directory structure"]
+fn walk_dir(p: path, f: fn(path) -> bool) {
 
+    walk_dir_(p, f);
+
+    fn walk_dir_(p: path, f: fn(path) -> bool) -> bool {
+        let mut keepgoing = true;
+        list_dir(p).each {|q|
+            let path = path::connect(p, q);
+            if !f(path) {
+                keepgoing = false;
+                false
+            } else {
+                if path_is_dir(path) {
+                    if !walk_dir_(path, f) {
+                        keepgoing = false;
+                        false
+                    } else {
+                        true
+                    }
+                } else {
+                    true
+                }
+            }
+        }
+        ret keepgoing;
+    }
+}
 
 #[doc = "Indicates whether a path represents a directory"]
 fn path_is_dir(p: path) -> bool {