Changeset 10466 for src/Pugs/Compat.hs

Timestamp:

06/03/06 08:12:31 (3 years ago)

Author:

audreyt

Message:

* Change file tests to use native POSIX stats in preparation

of true chained tests.

Files:

• src/Pugs/Compat.hs (modified) (6 diffs)

src/Pugs/Compat.hs

@@ -1 @@
-{-# OPTIONS_GHC -fglasgow-exts -fvia-C -optc-w -fno-warn-orphans -cpp #-}
+{-# OPTIONS_GHC -fglasgow-exts -fvia-C -optc-w -fno-warn-orphans -cpp -fno-warn-deprecations #-}
 
 {-|
@@ -43 +43 @@
     closeDirStream,
     executeFile',        -- the prime signifies we changed signature.
+    getCurrentDirectory,
+    setCurrentDirectory,
+    doesFileExist,
+    doesDirectoryExist,
+    doesExist,
 ) where
 
@@ -49 +54 @@
 
 #ifdef PUGS_HAVE_POSIX
+import System.Posix.Files
 import System.Posix.Process
 import System.Posix.Env hiding (getEnvironment)
-import System.Posix.Files
 import System.Posix.Directory
 import System.Posix.User
@@ -61 +66 @@
 import qualified System.Posix.Signals
 
+doesExist :: FilePath -> IO Bool
+doesExist = fileExist
+
+doesFileExist :: FilePath -> IO Bool
+doesFileExist f = do
+    rv <- (fmap isRegularFile . getFileStatus) f
+    return rv
+
+doesDirectoryExist :: FilePath -> IO Bool
+doesDirectoryExist = fmap isDirectory . getFileStatus
+
+getCurrentDirectory :: IO FilePath
+getCurrentDirectory = getWorkingDirectory
+
+setCurrentDirectory :: FilePath -> IO ()
+setCurrentDirectory = changeWorkingDirectory
+
 executeFile' :: FilePath -> Bool -> [String] -> Maybe [(String, String)] -> IO ExitCode
 executeFile' prog search args env = do
@@ -87 +109 @@
 import Debug.Trace
 import qualified System.Environment
+import System.Directory (getCurrentDirectory, setCurrentDirectory, doesFileExist, doesDirectoryExist)
 import IO
 import System.IO
@@ -245 +268 @@
 executeFile' _ _ _ _ = failWithIncomplete "executeFile"
 
+doesExist :: FilePath -> IO Bool
+doesExist f = do
+    rv <- doesFileExist f
+    if rv then return rv else doesDirectoryExist f
+
 #endif