[project @ 2005-01-28 13:36:25 by simonmar]

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

diff --git a/System/Cmd.hs b/System/Cmd.hs
index 6fe8fa1..cf1dc5b 100644 (file)
--- 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,62 +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 :: 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
+system cmd = do
+  p <- runCommand cmd
+  waitForProcess p
+#endif  /* __GLASGOW_HASKELL__ */
 
-#else
+{-|
+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'.
 
--- On Windows, the command line is passed to the operating system as
--- a single string.  Command-line parsing is done by the executable
--- itself.
+The return codes and possible failures are the same as for 'system'.
+-}
+rawSystem :: String -> [String] -> IO ExitCode
+#ifdef __GLASGOW_HASKELL__
 rawSystem cmd args = do
-       -- NOTE: 'cmd' is assumed to contain the application to run _only_,
-       -- as it'll be quoted surrounded in quotes here.
-  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)
+  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
-translate str@('"':_) = str -- already escaped.
-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
-
-#endif
-
-#endif  /* __GLASGOW_HASKELL__ */
+#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__ */