[project @ 2004-09-30 09:42:17 by simonmar]

[ghc-base.git] / System / Cmd.hs

diff --git a/System/Cmd.hs b/System/Cmd.hs
index 4e7d284..ceb0bbe 100644 (file)
--- a/System/Cmd.hs
+++ b/System/Cmd.hs
@@ -15,17 +15,16 @@
 module System.Cmd
     ( system,        -- :: String -> IO ExitCode
 #ifdef __GLASGOW_HASKELL__
-      rawSystem,     -- :: String -> IO ExitCode
+      rawSystem,     -- :: FilePath -> [String] -> IO ExitCode
 #endif
     ) where
 
 import Prelude
 
 #ifdef __GLASGOW_HASKELL__
-import Foreign
-import Foreign.C
-import System.Exit
-import GHC.IOBase
+import System.Process
+import System.Exit     ( ExitCode )
+import GHC.IOBase      ( ioException, IOException(..), IOErrorType(..) )
 #endif
 
 #ifdef __HUGS__
@@ -62,59 +61,12 @@ passes the command to the Windows command interpreter (@CMD.EXE@ or
 #ifdef __GLASGOW_HASKELL__
 system :: String -> IO ExitCode
 system "" = ioException (IOError Nothing InvalidArgument "system" "null command" Nothing)
-system cmd =
-  withCString cmd $ \s -> do
-    status <- throwErrnoIfMinus1 "system" (primSystem s)
-    case status of
-        0  -> return ExitSuccess
-        n  -> return (ExitFailure n)
+system cmd = do
+  p <- runCommand cmd
+  waitForProcess p
 
-foreign import ccall unsafe "systemCmd" primSystem :: CString -> IO Int
-
-{- | 
-The same as 'system', but bypasses the shell (GHC only).
-Will behave more portably between systems,
-because there is no interpretation of shell metasyntax.
--}
-
-rawSystem :: FilePath -> [String] -> IO ExitCode
-
-#ifndef mingw32_TARGET_OS
-
-rawSystem cmd args =
-  withCString cmd $ \pcmd ->
-    withMany withCString (cmd:args) $ \cstrs ->
-      withArray0 nullPtr cstrs $ \arr -> do
-       status <- throwErrnoIfMinus1 "rawSystem" (c_rawSystem pcmd arr)
-        case status of
-            0  -> return ExitSuccess
-            n  -> return (ExitFailure n)
-
-foreign import ccall unsafe "rawSystem"
-  c_rawSystem :: CString -> Ptr CString -> IO Int
-
-#else
-
--- On Windows, the command line is passed to the operating system as
--- a single string.  Command-line parsing is done by the executable
--- itself.
+rawSystem :: String -> [String] -> IO ExitCode
 rawSystem cmd args = do
-  let cmdline = translate cmd ++ concat (map ((' ':) . translate) args)
-  withCString cmdline $ \pcmdline -> do
-    status <- throwErrnoIfMinus1 "rawSystem" (c_rawSystem pcmdline)
-    case status of
-       0  -> return ExitSuccess
-       n  -> return (ExitFailure n)
-
-translate :: String -> String
-translate str = '"' : foldr escape "\"" str
-  where escape '"'  str = '\\' : '"'  : str
-       escape '\\' str = '\\' : '\\' : str
-       escape c    str = c : str
-
-foreign import ccall unsafe "rawSystem"
-  c_rawSystem :: CString -> IO Int
-
-#endif
-
+  p <- runProcess cmd args Nothing Nothing Nothing Nothing Nothing
+  waitForProcess p
 #endif  /* __GLASGOW_HASKELL__ */