diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-04-03 15:33:28 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-03 15:35:18 -0400 |
| commit | 141937ed091643e2c47207f3818f46c7cf341189 (patch) | |
| tree | 102dfcdef294cdc0ca6404232962749d213fac41 /Utility | |
| parent | fff817f70ce3c86d873775c0d113b074cc486ff8 (diff) | |
rename bothHandles -> ioHandles
Diffstat (limited to 'Utility')
| -rw-r--r-- | Utility/Gpg.hs | 2 | ||||
| -rw-r--r-- | Utility/Process.hs | 14 | ||||
| -rw-r--r-- | Utility/SimpleProtocol.hs | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/Utility/Gpg.hs b/Utility/Gpg.hs index 37508a495..3112db1bd 100644 --- a/Utility/Gpg.hs +++ b/Utility/Gpg.hs @@ -87,7 +87,7 @@ readStrict params = do pipeStrict :: [CommandParam] -> String -> IO String pipeStrict params input = do params' <- stdParams params - withBothHandles createProcessSuccess (proc gpgcmd params') $ \(to, from) -> do + withIOHandles createProcessSuccess (proc gpgcmd params') $ \(to, from) -> do hSetBinaryMode to True hSetBinaryMode from True hPutStr to input diff --git a/Utility/Process.hs b/Utility/Process.hs index 8fefaa54c..ae09b5958 100644 --- a/Utility/Process.hs +++ b/Utility/Process.hs @@ -25,14 +25,14 @@ module Utility.Process ( processTranscript, processTranscript', withHandle, - withBothHandles, + withIOHandles, withQuietOutput, createProcess, startInteractiveProcess, stdinHandle, stdoutHandle, stderrHandle, - bothHandles, + ioHandles, processHandle, devNull, ) where @@ -255,12 +255,12 @@ withHandle h creator p a = creator p' $ a . select (stderrHandle, base { std_err = CreatePipe }) {- Like withHandle, but passes (stdin, stdout) handles to the action. -} -withBothHandles +withIOHandles :: CreateProcessRunner -> CreateProcess -> ((Handle, Handle) -> IO a) -> IO a -withBothHandles creator p a = creator p' $ a . bothHandles +withIOHandles creator p a = creator p' $ a . ioHandles where p' = p { std_in = CreatePipe @@ -303,9 +303,9 @@ stdoutHandle _ = error "expected stdoutHandle" stderrHandle :: HandleExtractor stderrHandle (_, _, Just h, _) = h stderrHandle _ = error "expected stderrHandle" -bothHandles :: (Maybe Handle, Maybe Handle, Maybe Handle, ProcessHandle) -> (Handle, Handle) -bothHandles (Just hin, Just hout, _, _) = (hin, hout) -bothHandles _ = error "expected bothHandles" +ioHandles :: (Maybe Handle, Maybe Handle, Maybe Handle, ProcessHandle) -> (Handle, Handle) +ioHandles (Just hin, Just hout, _, _) = (hin, hout) +ioHandles _ = error "expected ioHandles" processHandle :: (Maybe Handle, Maybe Handle, Maybe Handle, ProcessHandle) -> ProcessHandle processHandle (_, _, _, pid) = pid diff --git a/Utility/SimpleProtocol.hs b/Utility/SimpleProtocol.hs index 4a2d8635e..52284d457 100644 --- a/Utility/SimpleProtocol.hs +++ b/Utility/SimpleProtocol.hs @@ -16,7 +16,7 @@ module Utility.SimpleProtocol ( parse1, parse2, parse3, - ioHandles, + dupIoHandles, ) where import Data.Char @@ -80,8 +80,8 @@ splitWord = separate isSpace - will mess up the protocol. To avoid that, close stdin, and - and duplicate stderr to stdout. Return two new handles - that are duplicates of the original (stdin, stdout). -} -ioHandles :: IO (Handle, Handle) -ioHandles = do +dupIoHandles :: IO (Handle, Handle) +duoIoHandles = do readh <- hDuplicate stdin writeh <- hDuplicate stdout nullh <- openFile devNull ReadMode |