Repository : ssh://darcs.haskell.org//srv/darcs/packages/base On branch : master
http://hackage.haskell.org/trac/ghc/changeset/f1f7bac3c73cff4376484334a17ab40b9ec81a51 >--------------------------------------------------------------- commit f1f7bac3c73cff4376484334a17ab40b9ec81a51 Author: Evan Laforge <[email protected]> Date: Sun Mar 11 18:23:43 2012 -0700 Whitespace only: convert mixed tabs and spaces to spaces. Signed-off-by: Paolo Capriotti <[email protected]> >--------------------------------------------------------------- System/Environment.hs | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/System/Environment.hs b/System/Environment.hs index d5bc1ad..72d7eba 100644 --- a/System/Environment.hs +++ b/System/Environment.hs @@ -70,34 +70,34 @@ import System getWin32ProgArgv_certainly :: IO [String] getWin32ProgArgv_certainly = do - mb_argv <- getWin32ProgArgv - case mb_argv of - Nothing -> fmap dropRTSArgs getFullArgs - Just argv -> return argv + mb_argv <- getWin32ProgArgv + case mb_argv of + Nothing -> fmap dropRTSArgs getFullArgs + Just argv -> return argv withWin32ProgArgv :: [String] -> IO a -> IO a withWin32ProgArgv argv act = bracket begin setWin32ProgArgv (\_ -> act) where begin = do - mb_old_argv <- getWin32ProgArgv - setWin32ProgArgv (Just argv) - return mb_old_argv + mb_old_argv <- getWin32ProgArgv + setWin32ProgArgv (Just argv) + return mb_old_argv getWin32ProgArgv :: IO (Maybe [String]) getWin32ProgArgv = alloca $ \p_argc -> alloca $ \p_argv -> do - c_getWin32ProgArgv p_argc p_argv - argc <- peek p_argc - argv_p <- peek p_argv - if argv_p == nullPtr - then return Nothing - else do - argv_ps <- peekArray (fromIntegral argc) argv_p - fmap Just $ mapM peekCWString argv_ps + c_getWin32ProgArgv p_argc p_argv + argc <- peek p_argc + argv_p <- peek p_argv + if argv_p == nullPtr + then return Nothing + else do + argv_ps <- peekArray (fromIntegral argc) argv_p + fmap Just $ mapM peekCWString argv_ps setWin32ProgArgv :: Maybe [String] -> IO () setWin32ProgArgv Nothing = c_setWin32ProgArgv 0 nullPtr setWin32ProgArgv (Just argv) = withMany withCWString argv $ \argv_ps -> withArrayLen argv_ps $ \argc argv_p -> do - c_setWin32ProgArgv (fromIntegral argc) argv_p + c_setWin32ProgArgv (fromIntegral argc) argv_p foreign import ccall unsafe "getWin32ProgArgv" c_getWin32ProgArgv :: Ptr CInt -> Ptr (Ptr CWString) -> IO () @@ -196,10 +196,10 @@ getEnv name = withCWString name $ \s -> try_size s 256 res <- c_GetEnvironmentVariable s p_value size case res of 0 -> do - err <- c_GetLastError - if err == eRROR_ENVVAR_NOT_FOUND - then ioe_missingEnvVar name - else throwGetLastError "getEnv" + err <- c_GetLastError + if err == eRROR_ENVVAR_NOT_FOUND + then ioe_missingEnvVar name + else throwGetLastError "getEnv" _ | res > size -> try_size s res -- Rare: size increased between calls to GetEnvironmentVariable | otherwise -> peekCWString p_value @@ -225,7 +225,7 @@ foreign import ccall unsafe "getenv" ioe_missingEnvVar :: String -> IO a ioe_missingEnvVar name = ioException (IOError Nothing NoSuchThing "getEnv" - "no environment variable" Nothing (Just name)) + "no environment variable" Nothing (Just name)) {-| 'withArgs' @args act@ - while executing action @act@, have 'getArgs' _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
