X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=System%2FCmd.hs;h=978c7a0ac9510b2ad22faa7c358ac82b4258a697;hb=3f2b8c7b91b7088eaa2a0c8a1b754ed14dad350f;hp=4e7d2847545c2ca9af7f8b3c48b4723486af1f9a;hpb=fcc7094bfb5cf5beb7d29ea9257adc6196ff9fc7;p=ghc-base.git

diff --git a/System/Cmd.hs b/System/Cmd.hs
index 4e7d284..978c7a0 100644
--- a/System/Cmd.hs
+++ b/System/Cmd.hs
@@ -15,7 +15,7 @@
 module System.Cmd
     ( system,        -- :: String -> IO ExitCode
 #ifdef __GLASGOW_HASKELL__
-      rawSystem,     -- :: String -> IO ExitCode
+      rawSystem,     -- :: FilePath -> [String] -> IO ExitCode
 #endif
     ) where
 
@@ -26,6 +26,7 @@ import Foreign
 import Foreign.C
 import System.Exit
 import GHC.IOBase
+#include "config.h"
 #endif
 
 #ifdef __HUGS__
@@ -71,50 +72,10 @@ system cmd =
 
 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 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
+-- ---------------------------------------------------------------------------
+-- rawSystem
 
-#endif
+-- rawSystem is in a separate file, so we can #include it various places.
+#include "RawSystem.hs-inc"
 
 #endif  /* __GLASGOW_HASKELL__ */