From ac29f3c340fca6b7362e089fd439cb0cf5e092f8 Mon Sep 17 00:00:00 2001
From: simonmar <unknown>
Date: Mon, 8 Jul 2002 10:43:10 +0000
Subject: [PATCH] [project @ 2002-07-08 10:43:10 by simonmar] Fix a bug in
 getDirectoryEntries where the directory stream wasn't
 always being closed.  This one shows up on Solaris as a
 "too many open files" failure when trying to run the test
 suite.

---
 System/Directory.hs |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index 02c6841..4f76ca6 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -333,19 +333,23 @@ The path refers to an existing non-directory object.
 
 getDirectoryContents :: FilePath -> IO [FilePath]
 getDirectoryContents path = do
-   alloca $ \ ptr_dEnt -> do
-    p <- withCString path $ \s ->
-	  throwErrnoIfNullRetry "getDirectoryContents" (c_opendir s)
-    loop ptr_dEnt p
+   alloca $ \ ptr_dEnt ->
+     bracket
+	(withCString path $ \s -> 
+	   throwErrnoIfNullRetry desc (c_opendir s))
+	(\p -> throwErrnoIfMinus1_ desc (c_closedir p))
+	(\p -> loop ptr_dEnt p)
   where
+    desc = "getDirectoryContents"
+
     loop :: Ptr (Ptr CDirent) -> Ptr CDir -> IO [String]
     loop ptr_dEnt dir = do
       resetErrno
       r <- readdir dir ptr_dEnt
-      if (r == 0) 
+      if (r == 0)
 	 then do
 	         dEnt    <- peek ptr_dEnt
-		 if (dEnt == nullPtr) 
+		 if (dEnt == nullPtr)
 		   then return []
 		   else do
 	 	    entry   <- (d_name dEnt >>= peekCString)
@@ -354,11 +358,10 @@ getDirectoryContents path = do
 		    return (entry:entries)
 	 else do errno <- getErrno
 		 if (errno == eINTR) then loop ptr_dEnt dir else do
-		 throwErrnoIfMinus1_ "getDirectoryContents" $ c_closedir dir
 		 let (Errno eo) = errno
 		 if (eo == end_of_dir)
 		    then return []
-		    else throwErrno "getDirectoryContents"
+		    else throwErrno desc
 
 
 
-- 
1.7.10.4