projects
/
ghc-base.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc wibble: Haskell 98 I/O Error -> 'IOError'
[ghc-base.git]
/
System
/
Environment.hs
diff --git
a/System/Environment.hs
b/System/Environment.hs
index
3271e29
..
b85bc42
100644
(file)
--- a/
System/Environment.hs
+++ b/
System/Environment.hs
@@
-13,8
+13,8
@@
-----------------------------------------------------------------------------
module System.Environment
-----------------------------------------------------------------------------
module System.Environment
- (
- getArgs, -- :: IO [String]
+ (
+ getArgs, -- :: IO [String]
getProgName, -- :: IO String
getEnv, -- :: String -> IO String
#ifndef __NHC__
getProgName, -- :: IO String
getEnv, -- :: String -> IO String
#ifndef __NHC__
@@
-29,11
+29,13
@@
module System.Environment
import Prelude
#ifdef __GLASGOW_HASKELL__
import Prelude
#ifdef __GLASGOW_HASKELL__
+import Data.List
import Foreign
import Foreign.C
import Foreign
import Foreign.C
-import Control.Exception ( bracket )
+import Control.Exception.Base ( bracket )
import Control.Monad
import Control.Monad
-import GHC.IOBase
+-- import GHC.IO
+import GHC.IO.Exception
#endif
#ifdef __HUGS__
#endif
#ifdef __HUGS__
@@
-56,15
+58,15
@@
import System
#ifdef __GLASGOW_HASKELL__
getArgs :: IO [String]
#ifdef __GLASGOW_HASKELL__
getArgs :: IO [String]
-getArgs =
- alloca $ \ p_argc ->
+getArgs =
+ alloca $ \ p_argc ->
alloca $ \ p_argv -> do
getProgArgv p_argc p_argv
p <- fromIntegral `liftM` peek p_argc
argv <- peek p_argv
peekArray (p - 1) (advancePtr argv 1) >>= mapM peekCString
alloca $ \ p_argv -> do
getProgArgv p_argc p_argv
p <- fromIntegral `liftM` peek p_argc
argv <- peek p_argv
peekArray (p - 1) (advancePtr argv 1) >>= mapM peekCString
-
+
foreign import ccall unsafe "getProgArgv"
getProgArgv :: Ptr CInt -> Ptr (Ptr CString) -> IO ()
foreign import ccall unsafe "getProgArgv"
getProgArgv :: Ptr CInt -> Ptr (Ptr CString) -> IO ()
@@
-79,15
+81,15
@@
between platforms: on Windows, for example, a program invoked as foo
is probably really @FOO.EXE@, and that is what 'getProgName' will return.
-}
getProgName :: IO String
is probably really @FOO.EXE@, and that is what 'getProgName' will return.
-}
getProgName :: IO String
-getProgName =
+getProgName =
alloca $ \ p_argc ->
alloca $ \ p_argv -> do
getProgArgv p_argc p_argv
argv <- peek p_argv
unpackProgName argv
alloca $ \ p_argc ->
alloca $ \ p_argv -> do
getProgArgv p_argc p_argv
argv <- peek p_argv
unpackProgName argv
-
-unpackProgName :: Ptr (Ptr CChar) -> IO String -- argv[0]
-unpackProgName argv = do
+
+unpackProgName :: Ptr (Ptr CChar) -> IO String -- argv[0]
+unpackProgName argv = do
s <- peekElemOff argv 0 >>= peekCString
return (basename s)
where
s <- peekElemOff argv 0 >>= peekCString
return (basename s)
where
@@
-95,7
+97,7
@@
unpackProgName argv = do
basename f = go f f
where
go acc [] = acc
basename f = go f f
where
go acc [] = acc
- go acc (x:xs)
+ go acc (x:xs)
| isPathSeparator x = go xs xs
| otherwise = go acc xs
| isPathSeparator x = go xs xs
| otherwise = go acc xs
@@
-120,9
+122,9
@@
getEnv name =
withCString name $ \s -> do
litstring <- c_getenv s
if litstring /= nullPtr
withCString name $ \s -> do
litstring <- c_getenv s
if litstring /= nullPtr
- then peekCString litstring
+ then peekCString litstring
else ioException (IOError Nothing NoSuchThing "getEnv"
else ioException (IOError Nothing NoSuchThing "getEnv"
- "no environment variable" (Just name))
+ "no environment variable" Nothing (Just name))
foreign import ccall unsafe "getenv"
c_getenv :: CString -> IO (Ptr CChar)
foreign import ccall unsafe "getenv"
c_getenv :: CString -> IO (Ptr CChar)
@@
-152,9
+154,10
@@
withArgv :: [String] -> IO a -> IO a
withArgv new_args act = do
pName <- System.Environment.getProgName
existing_args <- System.Environment.getArgs
withArgv new_args act = do
pName <- System.Environment.getProgName
existing_args <- System.Environment.getArgs
- bracket (setArgs new_args)
- (\argv -> do setArgs (pName:existing_args); freeArgv argv)
- (const act)
+ bracket (setArgs new_args)
+ (\argv -> do _ <- setArgs (pName:existing_args)
+ freeArgv argv)
+ (const act)
freeArgv :: Ptr CString -> IO ()
freeArgv argv = do
freeArgv :: Ptr CString -> IO ()
freeArgv argv = do
@@
-165,11
+168,11
@@
freeArgv argv = do
setArgs :: [String] -> IO (Ptr CString)
setArgs argv = do
vs <- mapM newCString argv >>= newArray0 nullPtr
setArgs :: [String] -> IO (Ptr CString)
setArgs argv = do
vs <- mapM newCString argv >>= newArray0 nullPtr
- setArgsPrim (length argv) vs
+ setArgsPrim (genericLength argv) vs
return vs
foreign import ccall unsafe "setProgArgv"
return vs
foreign import ccall unsafe "setProgArgv"
- setArgsPrim :: Int -> Ptr CString -> IO ()
+ setArgsPrim :: CInt -> Ptr CString -> IO ()
-- |'getEnvironment' retrieves the entire environment as a
-- list of @(key,value)@ pairs.
-- |'getEnvironment' retrieves the entire environment as a
-- list of @(key,value)@ pairs.
@@
-185,7
+188,7
@@
getEnvironment = do
stuff <- peekArray0 nullPtr pBlock >>= mapM peekCString
return (map divvy stuff)
where
stuff <- peekArray0 nullPtr pBlock >>= mapM peekCString
return (map divvy stuff)
where
- divvy str =
+ divvy str =
case break (=='=') str of
(xs,[]) -> (xs,[]) -- don't barf (like Posix.getEnvironment)
(name,_:value) -> (name,value)
case break (=='=') str of
(xs,[]) -> (xs,[]) -- don't barf (like Posix.getEnvironment)
(name,_:value) -> (name,value)