From 0220609928a6561195225a89761c19458645386b Mon Sep 17 00:00:00 2001
From: Doug Coleman <erg@jobim.local>
Date: Fri, 24 Apr 2009 16:24:31 -0500
Subject: [PATCH] handle errors when traversing directories

---
 basis/io/directories/search/search.factor | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/basis/io/directories/search/search.factor b/basis/io/directories/search/search.factor
index dc97d4fe45..2202f7aa08 100755
--- a/basis/io/directories/search/search.factor
+++ b/basis/io/directories/search/search.factor
@@ -24,7 +24,7 @@ IN: io.directories.search
 TUPLE: directory-iterator path bfs queue ;
 
 : push-directory-entries ( path iter -- )
-    [ qualified-directory-entries ] dip '[
+    [ [ qualified-directory-entries ] [ 2drop f ] recover ] dip '[
         _ [ queue>> ] [ bfs>> ] bi
         [ push-front ] [ push-back ] if
     ] each ;
@@ -70,16 +70,12 @@ PRIVATE>
     [ ] accumulator [ each-directory-entry ] dip ;
 
 : find-file ( path bfs? quot -- path/f )
-    '[
-        _ _ _ [ <directory-iterator> ] dip
-        [ keep and ] curry iterate-directory
-    ] [ drop f ] recover ;
+    [ <directory-iterator> ] dip
+    [ keep and ] curry iterate-directory ;
 
 : find-all-files ( path quot -- paths/f )
-    '[
-        _ _ [ f <directory-iterator> ] dip
-        pusher [ [ f ] compose iterate-directory drop ] dip
-    ] [ drop f ] recover ;
+    [ f <directory-iterator> ] dip pusher
+    [ [ f ] compose iterate-directory drop ] dip ;
 
 ERROR: file-not-found path bfs? quot ;