projects
/
haskell-directory.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use filepath rather than our own System.Directory.Internals
[haskell-directory.git]
/
System
/
Directory.hs
diff --git
a/System/Directory.hs
b/System/Directory.hs
index
6fff3ad
..
fa48bf2
100644
(file)
--- a/
System/Directory.hs
+++ b/
System/Directory.hs
@@
-39,6
+39,7
@@
module System.Directory
, copyFile -- :: FilePath -> FilePath -> IO ()
, canonicalizePath
, copyFile -- :: FilePath -> FilePath -> IO ()
, canonicalizePath
+ , makeRelativeToCurrentDirectory
, findExecutable
-- * Existence tests
, findExecutable
-- * Existence tests
@@
-65,14
+66,13
@@
module System.Directory
, getModificationTime -- :: FilePath -> IO ClockTime
) where
, getModificationTime -- :: FilePath -> IO ClockTime
) where
-import System.Directory.Internals
import System.Environment ( getEnv )
import System.Environment ( getEnv )
+import System.FilePath
import System.IO.Error
import Control.Monad ( when, unless )
#ifdef __NHC__
import Directory
import System.IO.Error
import Control.Monad ( when, unless )
#ifdef __NHC__
import Directory
-import NHC.FFI
#endif /* __NHC__ */
#ifdef __HUGS__
#endif /* __NHC__ */
#ifdef __HUGS__
@@
-82,7
+82,7
@@
import Hugs.Directory
import Foreign
import Foreign.C
import Foreign
import Foreign.C
-{-# CFILES cbits/PrelIOUtils.c #-}
+{-# CFILES cbits/directory.c #-}
#ifdef __GLASGOW_HASKELL__
import Prelude
#ifdef __GLASGOW_HASKELL__
import Prelude
@@
-270,11
+270,12
@@
createDirectoryIfMissing :: Bool -- ^ Create its parents too?
-> IO ()
createDirectoryIfMissing parents file = do
b <- doesDirectoryExist file
-> IO ()
createDirectoryIfMissing parents file = do
b <- doesDirectoryExist file
- case (b,parents, file) of
+ case (b,parents, file) of
(_, _, "") -> return ()
(True, _, _) -> return ()
(_, _, "") -> return ()
(True, _, _) -> return ()
- (_, True, _) -> mapM_ (createDirectoryIfMissing False) (tail (pathParents file))
+ (_, True, _) -> mapM_ (createDirectoryIfMissing False) $ mkParents file
(_, False, _) -> createDirectory file
(_, False, _) -> createDirectory file
+ where mkParents = scanl1 (</>) . splitDirectories . dropDrive . normalise
#if __GLASGOW_HASKELL__
{- | @'removeDirectory' dir@ removes an existing directory /dir/. The
#if __GLASGOW_HASKELL__
{- | @'removeDirectory' dir@ removes an existing directory /dir/. The
@@
-331,7
+332,7
@@
removeDirectory path = do
removeDirectoryRecursive :: FilePath -> IO ()
removeDirectoryRecursive startLoc = do
cont <- getDirectoryContents startLoc
removeDirectoryRecursive :: FilePath -> IO ()
removeDirectoryRecursive startLoc = do
cont <- getDirectoryContents startLoc
- sequence_ [rm (startLoc `joinFileName` x) | x <- cont, x /= "." && x /= ".."]
+ sequence_ [rm (startLoc </> x) | x <- cont, x /= "." && x /= ".."]
removeDirectory startLoc
where
rm :: FilePath -> IO ()
removeDirectory startLoc
where
rm :: FilePath -> IO ()
@@
-597,6
+598,12
@@
foreign import ccall unsafe "realpath"
-> IO CString
#endif
-> IO CString
#endif
+-- | 'makeRelative' the current directory.
+makeRelativeToCurrentDirectory :: FilePath -> IO FilePath
+makeRelativeToCurrentDirectory x = do
+ cur <- getCurrentDirectory
+ return $ makeRelative cur x
+
-- | Given an executable file name, searches for such file
-- in the directories listed in system PATH. The returned value
-- is the path to the found executable or Nothing if there isn't
-- | Given an executable file name, searches for such file
-- in the directories listed in system PATH. The returned value
-- is the path to the found executable or Nothing if there isn't
@@
-626,16
+633,16
@@
foreign import stdcall unsafe "SearchPathA"
#else
do
path <- getEnv "PATH"
#else
do
path <- getEnv "PATH"
- search (parseSearchPath path)
+ search (splitSearchPath path)
where
where
- fileName = binary `joinFileExt` exeExtension
+ fileName = binary <.> exeExtension
search :: [FilePath] -> IO (Maybe FilePath)
search [] = return Nothing
search (d:ds) = do
search :: [FilePath] -> IO (Maybe FilePath)
search [] = return Nothing
search (d:ds) = do
- let path = d `joinFileName` fileName
- b <- doesFileExist path
- if b then return (Just path)
+ let path = d </> fileName
+ b <- doesFileExist path
+ if b then return (Just path)
else search ds
#endif
else search ds
#endif
@@
-863,19
+870,23
@@
fileNameEndClean name =
i = (length name) - 1
ec = name !! i
i = (length name) - 1
ec = name !! i
-foreign import ccall unsafe "__hscore_R_OK" r_OK :: CMode
-foreign import ccall unsafe "__hscore_W_OK" w_OK :: CMode
-foreign import ccall unsafe "__hscore_X_OK" x_OK :: CMode
+foreign import ccall unsafe "__hscore_R_OK" r_OK :: CInt
+foreign import ccall unsafe "__hscore_W_OK" w_OK :: CInt
+foreign import ccall unsafe "__hscore_X_OK" x_OK :: CInt
foreign import ccall unsafe "__hscore_S_IRUSR" s_IRUSR :: CMode
foreign import ccall unsafe "__hscore_S_IWUSR" s_IWUSR :: CMode
foreign import ccall unsafe "__hscore_S_IXUSR" s_IXUSR :: CMode
foreign import ccall unsafe "__hscore_S_IRUSR" s_IRUSR :: CMode
foreign import ccall unsafe "__hscore_S_IWUSR" s_IWUSR :: CMode
foreign import ccall unsafe "__hscore_S_IXUSR" s_IXUSR :: CMode
-#endif /* __GLASGOW_HASKELL__ */
-
foreign import ccall unsafe "__hscore_long_path_size"
long_path_size :: Int
foreign import ccall unsafe "__hscore_long_path_size"
long_path_size :: Int
+#else
+long_path_size :: Int
+long_path_size = 2048 -- // guess?
+
+#endif /* __GLASGOW_HASKELL__ */
+
{- | Returns the current user's home directory.
The directory returned is expected to be writable by the current user,
{- | Returns the current user's home directory.
The directory returned is expected to be writable by the current user,
@@
-1039,3
+1050,14
@@
raiseUnsupported loc =
ioException (IOError Nothing UnsupportedOperation loc "unsupported operation" Nothing)
#endif
ioException (IOError Nothing UnsupportedOperation loc "unsupported operation" Nothing)
#endif
+
+-- ToDo: This should be determined via autoconf (AC_EXEEXT)
+-- | Extension for executable files
+-- (typically @\"\"@ on Unix and @\"exe\"@ on Windows or OS\/2)
+exeExtension :: String
+#ifdef mingw32_HOST_OS
+exeExtension = "exe"
+#else
+exeExtension = ""
+#endif
+