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

diff --git a/System/Cmd.hs b/System/Cmd.hs
index cb8d2d9..cf1dc5b 100644
--- a/System/Cmd.hs
+++ b/System/Cmd.hs
@@ -14,19 +14,16 @@
 
 module System.Cmd
     ( system,        -- :: String -> IO ExitCode
-#ifdef __GLASGOW_HASKELL__
       rawSystem,     -- :: FilePath -> [String] -> IO ExitCode
-#endif
     ) where
 
 import Prelude
 
+import System.Exit 	( ExitCode )
+
 #ifdef __GLASGOW_HASKELL__
-import Foreign
-import Foreign.C
-import System.Exit
-import GHC.IOBase
-#include "config.h"
+import System.Process
+import GHC.IOBase	( ioException, IOException(..), IOErrorType(..) )
 #endif
 
 #ifdef __HUGS__
@@ -63,18 +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
+system cmd = do
+  p <- runCommand cmd
+  waitForProcess p
 #endif  /* __GLASGOW_HASKELL__ */
 
--- ---------------------------------------------------------------------------
--- rawSystem
+{-|
+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'.
+
+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)))
 
--- rawSystem is in a separate file, so we can #include it various places.
-#include "RawSystem.hs-inc"
+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__ */