From 619c8bd261a4fee0b0d40b664e55c51782e062f7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 21 Jul 2014 16:35:23 -0400 Subject: Merge from git-annex. --- Utility/CoProcess.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Utility/CoProcess.hs') diff --git a/Utility/CoProcess.hs b/Utility/CoProcess.hs index c113401..332c09d 100644 --- a/Utility/CoProcess.hs +++ b/Utility/CoProcess.hs @@ -3,7 +3,7 @@ - - Copyright 2012-2013 Joey Hess - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} @@ -37,8 +37,8 @@ data CoProcessSpec = CoProcessSpec } start :: Int -> FilePath -> [String] -> Maybe [(String, String)] -> IO CoProcessHandle -start numrestarts cmd params env = do - s <- start' $ CoProcessSpec numrestarts cmd params env +start numrestarts cmd params environ = do + s <- start' $ CoProcessSpec numrestarts cmd params environ newMVar s start' :: CoProcessSpec -> IO CoProcessState @@ -62,7 +62,7 @@ query ch send receive = do s <- readMVar ch restartable s (send $ coProcessTo s) $ const $ restartable s (hFlush $ coProcessTo s) $ const $ - restartable s (receive $ coProcessFrom s) $ + restartable s (receive $ coProcessFrom s) return where restartable s a cont -- cgit v1.2.3