ssh 0.2.10 → 0.2.11
raw patch · 2 files changed
+9/−7 lines, 2 filesnew-uploader
Files
- src/SSH/Channel.hs +5/−3
- ssh.cabal +4/−4
src/SSH/Channel.hs view
@@ -2,6 +2,7 @@ module SSH.Channel where import Control.Concurrent+import Control.Exception import Control.Monad (when) import Control.Monad.Trans.State import Data.Word@@ -177,10 +178,11 @@ cproc <- gets csProcess case cproc of Nothing -> return ()- Just (Process phdl _ _ _) -> do+ Just (Process phdl pin _ _) -> do -- NOTE: this doesn't necessarily guarantee termination -- see System.Process docs- io $ terminateProcess phdl+ -- nb closing stdin seems necessary, or process won't die+ io (hClose pin >> terminateProcess phdl) channelError :: String -> Channel ()@@ -253,7 +255,7 @@ getAvailable :: IO String getAvailable = do- ready <- hReady h `catch` const (return False)+ ready <- hReady h `Control.Exception.catch` (const (return False) :: IOException -> IO Bool) if not ready then return "" else do
ssh.cabal view
@@ -1,5 +1,5 @@ name: ssh-version: 0.2.10+version: 0.2.11 synopsis: A pure-Haskell SSH server library. description: This package was split from darcsden into its own project; documentation@@ -13,8 +13,8 @@ homepage: http://darcsden.com/alex/ssh license: BSD3 license-file: LICENSE-author: Alex Suraci-maintainer: i.am@toogeneric.com+author: Alex Suraci <suraci.alex@gmail.com>+maintainer: Alex Suraci <suraci.alex@gmail.com> category: Network build-type: Simple cabal-version: >= 1.6@@ -22,7 +22,7 @@ source-repository head type: darcs- location: http://darcsden.com/alex/ssh+ location: http://hub.darcs.net/simon/ssh library hs-source-dirs: src