X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=System%2FCmd.hs;h=cf1dc5ba9ce6bdf563405f39117e716d88473127;hb=ec3ba94b254bd444e7a1c560c1d91c4879948c69;hp=6671b31ba92f663f954ead3ac1c1c4ca8337973b;hpb=75ea0fa2485c169f0546d5d40477d2f6747efe29;p=ghc-base.git

diff --git a/System/Cmd.hs b/System/Cmd.hs
index 6671b31..cf1dc5b 100644
--- a/System/Cmd.hs
+++ b/System/Cmd.hs
@@ -14,17 +14,16 @@
 
 module System.Cmd
     ( system,        -- :: String -> IO ExitCode
-#ifdef __GLASGOW_HASKELL__
-      rawSystem,     -- :: String -> IO ExitCode
-#endif
+      rawSystem,     -- :: FilePath -> [String] -> IO ExitCode
     ) where
 
 import Prelude
 
+import System.Exit 	( ExitCode )
+
 #ifdef __GLASGOW_HASKELL__
-import System.Exit
-import Foreign.C
-import GHC.IOBase
+import System.Process
+import GHC.IOBase	( ioException, IOException(..), IOErrorType(..) )
 #endif
 
 #ifdef __HUGS__
@@ -61,30 +60,39 @@ 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)
-
-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 :: 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)
+system cmd = do
+  p <- runCommand cmd
+  waitForProcess p
+#endif  /* __GLASGOW_HASKELL__ */
 
-foreign import ccall unsafe "rawSystemCmd" primRawSystem :: CString -> IO Int
+{-|
+The computation @'rawSystem' cmd args@ runs the operating system command
+@cmd@ in such a way that it receives as arguments the @args@ strings
+exactly as given, with no funny escaping or shell meta-syntax expansion.
+It will therefore behave more portably between operating systems than 'system'.
 
-#endif  /* __GLASGOW_HASKELL__ */
+The return codes and possible failures are the same as for 'system'.
+-}
+rawSystem :: String -> [String] -> IO ExitCode
+#ifdef __GLASGOW_HASKELL__
+rawSystem cmd args = do
+  p <- runProcess cmd args Nothing Nothing Nothing Nothing Nothing
+  waitForProcess p
+#else /* ! __GLASGOW_HASKELL__ */
+-- crude fallback implementation: could do much better than this under Unix
+rawSystem cmd args = system (unwords (map translate (cmd:args)))
+
+translate :: String -> String
+#if defined(mingw32_HOST_OS)
+-- copied from System.Process (qv)
+translate str = '"' : snd (foldr escape (True,"\"") str)
+  where	escape '"'  (b,     str) = (True,  '\\' : '"'  : str)
+	escape '\\' (True,  str) = (True,  '\\' : '\\' : str)
+	escape '\\' (False, str) = (False, '\\' : str)
+	escape c    (b,     str) = (False, c : str)
+#else /* ! mingw32_HOST_OS */
+translate str = '\'' : foldr escape "'" str
+  where	escape '\'' cs = '\'' : '\\' : '\'' : '\'' : cs
+	escape c    cs = c : cs
+#endif /* ! mingw32_HOST_OS */
+#endif /* ! __GLASGOW_HASKELL__ */