[project @ 2004-11-13 14:37:18 by panne]

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

diff --git a/System/Cmd.hs b/System/Cmd.hs
index ff9a316..ceb0bbe 100644 (file)
--- a/System/Cmd.hs
+++ b/System/Cmd.hs
@@ -13,24 +13,28 @@
 -----------------------------------------------------------------------------
 
 module System.Cmd
-    ( system        -- :: String -> IO ExitCode
+    ( system,        -- :: String -> IO ExitCode
+#ifdef __GLASGOW_HASKELL__
+      rawSystem,     -- :: FilePath -> [String] -> IO ExitCode
+#endif
     ) where
 
 import Prelude
 
-import System.Exit
-#ifndef __HUGS__
-import Foreign.C
-#endif
-
 #ifdef __GLASGOW_HASKELL__
-import GHC.IOBase
+import System.Process
+import System.Exit     ( ExitCode )
+import GHC.IOBase      ( ioException, IOException(..), IOErrorType(..) )
 #endif
 
 #ifdef __HUGS__
 import Hugs.System
 #endif
 
+#ifdef __NHC__
+import System (system)
+#endif
+
 -- ---------------------------------------------------------------------------
 -- system
 
@@ -54,15 +58,15 @@ call, which ignores the @SHELL@ environment variable, and always
 passes the command to the Windows command interpreter (@CMD.EXE@ or
 @COMMAND.COM@), hence Unixy shell tricks will not work.
 -}
-#ifndef __HUGS__
+#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
-#endif  /* __HUGS__ */
+rawSystem :: String -> [String] -> IO ExitCode
+rawSystem cmd args = do
+  p <- runProcess cmd args Nothing Nothing Nothing Nothing Nothing
+  waitForProcess p
+#endif  /* __GLASGOW_HASKELL__ */