diff options
author | Richard Hartmann <richih@debian.org> | 2015-12-16 07:23:53 +0100 |
---|---|---|
committer | Richard Hartmann <richih@debian.org> | 2015-12-16 07:23:53 +0100 |
commit | 53679fdc47d9470c2540fbe38d5de38c91c3bb01 (patch) | |
tree | e3151adb4d04e905dbb930b67cdb959fac5ea513 /Utility/Misc.hs | |
parent | c94e89d797b15833875ebeb6adcaa6e130315f8e (diff) | |
parent | 259c511a17669d043a573344e59eae9e9956265c (diff) | |
download | git-repair-53679fdc47d9470c2540fbe38d5de38c91c3bb01.tar.gz |
Merge tag '1.20151215' into debian
tagging package git-repair version 1.20151215
Diffstat (limited to 'Utility/Misc.hs')
-rw-r--r-- | Utility/Misc.hs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Utility/Misc.hs b/Utility/Misc.hs index 949f41e..ebb4257 100644 --- a/Utility/Misc.hs +++ b/Utility/Misc.hs @@ -1,28 +1,30 @@ {- misc utility functions - - - Copyright 2010-2011 Joey Hess <joey@kitenet.net> + - Copyright 2010-2011 Joey Hess <id@joeyh.name> - - License: BSD-2-clause -} {-# LANGUAGE CPP #-} +{-# OPTIONS_GHC -fno-warn-tabs #-} module Utility.Misc where +import Utility.FileSystemEncoding +import Utility.Monad + import System.IO import Control.Monad import Foreign import Data.Char import Data.List -import Control.Applicative import System.Exit #ifndef mingw32_HOST_OS import System.Posix.Process (getAnyProcessStatus) import Utility.Exception #endif - -import Utility.FileSystemEncoding -import Utility.Monad +import Control.Applicative +import Prelude {- A version of hgetContents that is not lazy. Ensures file is - all read before it gets closed. -} @@ -134,7 +136,7 @@ hGetSomeString h sz = do - if this reap gets there first. -} reapZombies :: IO () #ifndef mingw32_HOST_OS -reapZombies = do +reapZombies = -- throws an exception when there are no child processes catchDefaultIO Nothing (getAnyProcessStatus False True) >>= maybe (return ()) (const reapZombies) |