X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=System%2FCmd.hs;h=9777bf1e115be71d2d2b10a23a43c8596bcd6ede;hb=b0968b64c77ee590c277c2986a630d3ba97dacff;hp=1eaaf786b8a038b69920fcf61ffbae98a2dae8aa;hpb=23b82c143e16abb767ba9e85db7fe84e26d32781;p=ghc-base.git

diff --git a/System/Cmd.hs b/System/Cmd.hs
index 1eaaf78..9777bf1 100644
--- a/System/Cmd.hs
+++ b/System/Cmd.hs
@@ -24,6 +24,10 @@ import System.Exit 	( ExitCode )
 #ifdef __GLASGOW_HASKELL__
 import System.Process
 import GHC.IOBase	( ioException, IOException(..), IOErrorType(..) )
+#if !defined(mingw32_HOST_OS)
+import System.Process.Internals
+import System.Posix.Signals
+#endif
 #endif
 
 #ifdef __HUGS__
@@ -60,9 +64,28 @@ 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 = do
-  p <- runCommand cmd
+system str = do
+#if mingw32_HOST_OS
+  p <- runCommand str
   waitForProcess p
+#else
+  -- The POSIX version of system needs to do some manipulation of signal
+  -- handlers.  Since we're going to be synchronously waiting for the child,
+  -- we want to ignore ^C in the parent, but handle it the default way
+  -- in the child (using SIG_DFL isn't really correct, it should be the
+  -- original signal handler, but the GHC RTS will have already set up
+  -- its own handler and we don't want to use that).
+  old_int  <- installHandler sigINT  Ignore Nothing
+  old_quit <- installHandler sigQUIT Ignore Nothing
+  (cmd,args) <- commandToProcess str
+  p <- runProcessPosix "runCommand" cmd args Nothing Nothing 
+		Nothing Nothing Nothing
+		(Just defaultSignal) (Just defaultSignal)
+  r <- waitForProcess p
+  installHandler sigINT  old_int Nothing
+  installHandler sigQUIT old_quit Nothing
+  return r
+#endif  /* mingw32_HOST_OS */
 #endif  /* __GLASGOW_HASKELL__ */
 
 {-|
@@ -76,23 +99,37 @@ The return codes and possible failures are the same as for 'system'.
 rawSystem :: String -> [String] -> IO ExitCode
 #ifdef __GLASGOW_HASKELL__
 rawSystem cmd args = do
+
+#if mingw32_HOST_OS
   p <- runProcess cmd args Nothing Nothing Nothing Nothing Nothing
   waitForProcess p
+#else
+  old_int  <- installHandler sigINT  Ignore Nothing
+  old_quit <- installHandler sigQUIT Ignore Nothing
+  p <- runProcessPosix "rawSystem" cmd args Nothing Nothing 
+		Nothing Nothing Nothing
+		(Just defaultSignal) (Just defaultSignal)
+  r <- waitForProcess p
+  installHandler sigINT  old_int Nothing
+  installHandler sigQUIT old_quit Nothing
+  return r
+#endif
+
 #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_TARGET_OS)
+#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_TARGET_OS */
+#else /* ! mingw32_HOST_OS */
 translate str = '\'' : foldr escape "'" str
   where	escape '\'' cs = '\'' : '\\' : '\'' : '\'' : cs
 	escape c    cs = c : cs
-#endif /* ! mingw32_TARGET_OS */
+#endif /* ! mingw32_HOST_OS */
 #endif /* ! __GLASGOW_HASKELL__ */