Fix build with process 1.2.1.0.

This commit is contained in:
Joey Hess 2015-01-04 12:52:22 -04:00
parent f2262991e9
commit 5db31e2386
5 changed files with 15 additions and 12 deletions

View file

@ -19,6 +19,7 @@ import qualified Build.SysConfig as SysConfig
#ifndef mingw32_HOST_OS
import System.Posix.Types
import qualified System.Posix.IO
import System.Path
import Utility.Env
#else
@ -108,7 +109,7 @@ feedRead :: (MonadIO m, MonadMask m) => [CommandParam] -> String -> (Handle -> I
feedRead params passphrase feeder reader = do
#ifndef mingw32_HOST_OS
-- pipe the passphrase into gpg on a fd
(frompipe, topipe) <- liftIO createPipe
(frompipe, topipe) <- liftIO System.Posix.IO.createPipe
liftIO $ void $ forkIO $ do
toh <- fdToHandle topipe
hPutStrLn toh passphrase

View file

@ -1,7 +1,7 @@
{- System.Process enhancements, including additional ways of running
- processes, and logging.
-
- Copyright 2012 Joey Hess <joey@kitenet.net>
- Copyright 2012 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
@ -38,7 +38,7 @@ module Utility.Process (
) where
import qualified System.Process
import System.Process as X hiding (CreateProcess(..), createProcess, runInteractiveProcess, readProcess, readProcessWithExitCode, system, rawSystem, runInteractiveCommand, runProcess)
import qualified System.Process as X hiding (CreateProcess(..), createProcess, runInteractiveProcess, readProcess, readProcessWithExitCode, system, rawSystem, runInteractiveCommand, runProcess)
import System.Process hiding (createProcess, readProcess)
import System.Exit
import System.IO
@ -47,7 +47,7 @@ import Control.Concurrent
import qualified Control.Exception as E
import Control.Monad
#ifndef mingw32_HOST_OS
import System.Posix.IO
import qualified System.Posix.IO
#else
import Control.Applicative
#endif
@ -175,9 +175,9 @@ processTranscript' cmd opts environ input = do
#ifndef mingw32_HOST_OS
{- This implementation interleves stdout and stderr in exactly the order
- the process writes them. -}
(readf, writef) <- createPipe
readh <- fdToHandle readf
writeh <- fdToHandle writef
(readf, writef) <- System.Posix.IO.createPipe
readh <- System.Posix.IO.fdToHandle readf
writeh <- System.Posix.IO.fdToHandle writef
p@(_, _, _, pid) <- createProcess $
(proc cmd opts)
{ std_in = if isJust input then CreatePipe else Inherit