[project @ 2001-08-04 06:19:54 by ken]

[ghc-hetmet.git] / ghc / lib / std / Directory.hsc

diff --git a/ghc/lib/std/Directory.hsc b/ghc/lib/std/Directory.hsc
index 2eba317..1ce5844 100644 (file)
--- a/ghc/lib/std/Directory.hsc
+++ b/ghc/lib/std/Directory.hsc
@@ -1,5 +1,5 @@
 -- -----------------------------------------------------------------------------
--- $Id: Directory.hsc,v 1.6 2001/02/14 12:36:06 rrt Exp $
+-- $Id: Directory.hsc,v 1.13 2001/07/13 11:48:52 rrt Exp $
 --
 -- (c) The University of Glasgow, 1994-2000
 --
@@ -54,17 +54,18 @@ import Prelude              -- Just to get it in the dependencies
 
 import Time             ( ClockTime(..) )
 
+import PrelPosix
 import PrelStorable
 import PrelCString
 import PrelMarshalAlloc
 import PrelCTypesISO
 import PrelCTypes
-import PrelPosixTypes
 import PrelCError
 import PrelPtr
 import PrelIOBase
 import PrelBase
 
+#include "config.h"
 #include <sys/stat.h>
 #include <dirent.h>
 #include <limits.h>
@@ -340,7 +341,7 @@ The path refers to an existing non-directory object.
 getDirectoryContents :: FilePath -> IO [FilePath]
 getDirectoryContents path = do
    p <- withUnsafeCString path $ \s ->
-         throwErrnoIfNullRetry "getDirectoryContents1" (opendir s)
+         throwErrnoIfNullRetry "getDirectoryContents" (opendir s)
    loop p
   where
     loop :: Ptr CDir -> IO [String]
@@ -359,14 +360,14 @@ getDirectoryContents path = do
                 return (entry:entries)
         else do errno <- getErrno
                 if (errno == eINTR) then loop dir else do
-                throwErrnoIfMinus1_ "getDirectoryContents2" $ closedir dir
+                throwErrnoIfMinus1_ "getDirectoryContents" $ closedir dir
 #ifndef mingw32_TARGET_OS
                 if (errno == eOK)
 #else
                 if (errno == eNOENT) -- mingwin (20001111) cunningly sets errno to ENOENT when it runs out of files
 #endif
                    then return []
-                   else throwErrno "getDirectoryContents3"
+                   else throwErrno "getDirectoryContents"
 
 {-
 If the operating system has a notion of current directories,
@@ -553,4 +554,3 @@ foreign import ccall unsafe closedir :: Ptr CDir -> IO CInt
 foreign import ccall unsafe stat     :: UCString -> Ptr CStat -> IO CInt
 
 type CDirent = ()
-type CStat   = ()