check for EINTR in openFd

1 files changed, 26 insertions, 2 deletions

diff --git a/System/Posix/Error.hs b/System/Posix/Error.hs
index 1f05b03..cd4b91e 100644
--- a/System/Posix/Error.hs
+++ b/System/Posix/Error.hs
@@ -16,10 +16,34 @@ module System.Posix.Error (
 	throwErrnoPath,
 	throwErrnoPathIf, 
 	throwErrnoPathIf_,
+        throwErrnoPathIfRetry,
 	throwErrnoPathIfNull,
+	throwErrnoPathIfNullRetry,
 	throwErrnoPathIfMinus1,
-	throwErrnoPathIfMinus1_
+	throwErrnoPathIfMinus1_,
+        throwErrnoPathIfMinus1Retry
   ) where
 
-import Foreign.C.Error
+import Foreign
+import Foreign.C
+
+throwErrnoPathIfMinus1Retry :: Num a => String -> FilePath -> IO a -> IO a
+throwErrnoPathIfMinus1Retry loc path f =
+  throwErrnoPathIfRetry (== -1) loc path f
+
+throwErrnoPathIfNullRetry :: String -> FilePath -> IO (Ptr a) -> IO (Ptr a)
+throwErrnoPathIfNullRetry loc path f =
+  throwErrnoPathIfRetry (== nullPtr) loc path f
+
+throwErrnoPathIfRetry :: (a -> Bool) -> String -> FilePath -> IO a -> IO a
+throwErrnoPathIfRetry pr loc path f =
+  do
+    res <- f
+    if pr res
+      then do
+        err <- getErrno
+        if err == eINTR
+          then throwErrnoPathIfRetry pr loc path f
+          else throwErrnoPath loc path
+      else return res