[project @ 2002-10-11 11:05:20 by malcolm]

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

diff --git a/System/Cmd.hs b/System/Cmd.hs
index ff9a316..b1492e0 100644 (file)
--- a/System/Cmd.hs
+++ b/System/Cmd.hs
@@ -13,17 +13,17 @@
 -----------------------------------------------------------------------------
 
 module System.Cmd
-    ( system        -- :: String -> IO ExitCode
+    ( system,        -- :: String -> IO ExitCode
+#ifdef __GLASGOW_HASKELL__
+      rawSystem,     -- :: String -> IO ExitCode
+#endif
     ) where
 
 import Prelude
 
+#ifdef __GLASGOW_HASKELL__
 import System.Exit
-#ifndef __HUGS__
 import Foreign.C
-#endif
-
-#ifdef __GLASGOW_HASKELL__
 import GHC.IOBase
 #endif
 
@@ -31,6 +31,10 @@ import GHC.IOBase
 import Hugs.System
 #endif
 
+#ifdef __NHC__
+import System (system)
+#endif
+
 -- ---------------------------------------------------------------------------
 -- system
 
@@ -54,7 +58,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 +69,21 @@ system cmd =
         n  -> return (ExitFailure n)
 
 foreign import ccall unsafe "systemCmd" primSystem :: CString -> IO Int
-#endif  /* __HUGS__ */
+
+{- | 
+The same as 'system', but bypasses the shell.  Will behave more portably between
+systems, because there is no interpretation of shell metasyntax.
+-}
+
+rawSystem :: String -> IO ExitCode
+rawSystem "" = ioException (IOError Nothing InvalidArgument "rawSystem" "null command" Nothing)
+rawSystem cmd =
+  withCString cmd $ \s -> do
+    status <- throwErrnoIfMinus1 "rawSystem" (primRawSystem s)
+    case status of
+        0  -> return ExitSuccess
+        n  -> return (ExitFailure n)
+
+foreign import ccall unsafe "rawSystemCmd" primRawSystem :: CString -> IO Int
+
+#endif  /* __GLASGOW_HASKELL__ */