[project @ 2004-05-06 08:44:52 by simonmar]

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

diff --git a/System/Cmd.hs b/System/Cmd.hs
index ff9a316..cb8d2d9 100644 (file)
--- a/System/Cmd.hs
+++ b/System/Cmd.hs
@@ -13,24 +13,30 @@
 -----------------------------------------------------------------------------
 
 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 Foreign
+import Foreign.C
+import System.Exit
 import GHC.IOBase
+#include "config.h"
 #endif
 
 #ifdef __HUGS__
 import Hugs.System
 #endif
 
+#ifdef __NHC__
+import System (system)
+#endif
+
 -- ---------------------------------------------------------------------------
 -- system
 
@@ -54,7 +60,7 @@ 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 =
@@ -65,4 +71,10 @@ system cmd =
         n  -> return (ExitFailure n)
 
 foreign import ccall unsafe "systemCmd" primSystem :: CString -> IO Int
-#endif  /* __HUGS__ */
+#endif  /* __GLASGOW_HASKELL__ */
+
+-- ---------------------------------------------------------------------------
+-- rawSystem
+
+-- rawSystem is in a separate file, so we can #include it various places.
+#include "RawSystem.hs-inc"