X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=GHC%2FHandle.hs;h=261c81c53a69ea801f703c5d19401f64a32c0276;hb=f11ef0c81fe851ae3d7b6cbd7be1264f03b475f8;hp=056e2af9bec073998c7a7994ef55a7f39ab7129e;hpb=a4860575fcc59c6fcdf9f7fe74e137264dc05da8;p=ghc-base.git diff --git a/GHC/Handle.hs b/GHC/Handle.hs index 056e2af..261c81c 100644 --- a/GHC/Handle.hs +++ b/GHC/Handle.hs @@ -55,7 +55,6 @@ module GHC.Handle ( ) where -import System.Directory.Internals import Control.Monad import Data.Bits import Data.Maybe @@ -76,6 +75,9 @@ import GHC.Enum import GHC.Num ( Integer(..), Num(..) ) import GHC.Show import GHC.Real ( toInteger ) +#if defined(DEBUG_DUMP) +import GHC.Pack +#endif import GHC.Conc @@ -154,6 +156,7 @@ withHandle_ :: String -> Handle -> (Handle__ -> IO a) -> IO a withHandle_ fun h@(FileHandle _ m) act = withHandle_' fun h m act withHandle_ fun h@(DuplexHandle _ m _) act = withHandle_' fun h m act +withHandle_' :: String -> Handle -> MVar Handle__ -> (Handle__ -> IO a) -> IO a withHandle_' fun h m act = block $ do h_ <- takeMVar m @@ -450,7 +453,7 @@ flushReadBuffer fd buf puts ("flushReadBuffer: new file offset = " ++ show off ++ "\n") # endif throwErrnoIfMinus1Retry "flushReadBuffer" - (c_lseek (fromIntegral fd) (fromIntegral off) sEEK_CUR) + (c_lseek fd (fromIntegral off) sEEK_CUR) return buf{ bufWPtr=0, bufRPtr=0 } flushWriteBuffer :: FD -> Bool -> Buffer -> IO Buffer @@ -463,7 +466,7 @@ flushWriteBuffer fd is_stream buf@Buffer{ bufBuf=b, bufRPtr=r, bufWPtr=w } = if bytes == 0 then return (buf{ bufRPtr=0, bufWPtr=0 }) else do - res <- writeRawBuffer "flushWriteBuffer" (fromIntegral fd) is_stream b + res <- writeRawBuffer "flushWriteBuffer" fd is_stream b (fromIntegral r) (fromIntegral bytes) let res' = fromIntegral res if res' < bytes @@ -512,7 +515,7 @@ fillReadBufferWithoutBlocking fd is_stream -- buffer better be empty: assert (r == 0 && w == 0) $ do #ifdef DEBUG_DUMP - puts ("fillReadBufferLoopNoBlock: bytes = " ++ show bytes ++ "\n") + puts ("fillReadBufferLoopNoBlock: bytes = " ++ show size ++ "\n") #endif res <- readRawBufferNoBlock "fillReadBuffer" fd is_stream b 0 (fromIntegral size) @@ -525,41 +528,104 @@ fillReadBufferWithoutBlocking fd is_stream -- Low level routines for reading/writing to (raw)buffers: #ifndef mingw32_HOST_OS -readRawBuffer :: String -> FD -> Bool -> RawBuffer -> Int -> CInt -> IO CInt -readRawBuffer loc fd is_stream buf off len = - throwErrnoIfMinus1RetryMayBlock loc - (read_rawBuffer fd buf off len) - (threadWaitRead (fromIntegral fd)) -readRawBufferNoBlock :: String -> FD -> Bool -> RawBuffer -> Int -> CInt -> IO CInt -readRawBufferNoBlock loc fd is_stream buf off len = - throwErrnoIfMinus1RetryOnBlock loc - (read_rawBuffer fd buf off len) - (return 0) +{- +NOTE [nonblock]: + +Unix has broken semantics when it comes to non-blocking I/O: you can +set the O_NONBLOCK flag on an FD, but it applies to the all other FDs +attached to the same underlying file, pipe or TTY; there's no way to +have private non-blocking behaviour for an FD. See bug #724. + +We fix this by only setting O_NONBLOCK on FDs that we create; FDs that +come from external sources or are exposed externally are left in +blocking mode. This solution has some problems though. We can't +completely simulate a non-blocking read without O_NONBLOCK: several +cases are wrong here. The cases that are wrong: + + * reading/writing to a blocking FD in non-threaded mode. + In threaded mode, we just make a safe call to read(). + In non-threaded mode we call select() before attempting to read, + but that leaves a small race window where the data can be read + from the file descriptor before we issue our blocking read(). + * readRawBufferNoBlock for a blocking FD +-} + +readRawBuffer :: String -> FD -> Bool -> RawBuffer -> Int -> CInt -> IO CInt +readRawBuffer loc fd is_nonblock buf off len + | is_nonblock = unsafe_read + | threaded = safe_read + | otherwise = do r <- throwErrnoIfMinus1 loc + (fdReady (fromIntegral fd) 0 0 False) + if r /= 0 + then unsafe_read + else do threadWaitRead (fromIntegral fd); unsafe_read + where + do_read call = throwErrnoIfMinus1RetryMayBlock loc call + (threadWaitRead (fromIntegral fd)) + unsafe_read = do_read (read_rawBuffer fd buf off len) + safe_read = do_read (safe_read_rawBuffer fd buf off len) readRawBufferPtr :: String -> FD -> Bool -> Ptr CChar -> Int -> CInt -> IO CInt -readRawBufferPtr loc fd is_stream buf off len = - throwErrnoIfMinus1RetryMayBlock loc - (read_off fd buf off len) - (threadWaitRead (fromIntegral fd)) +readRawBufferPtr loc fd is_nonblock buf off len + | is_nonblock = unsafe_read + | threaded = safe_read + | otherwise = do r <- throwErrnoIfMinus1 loc + (fdReady (fromIntegral fd) 0 0 False) + if r /= 0 + then unsafe_read + else do threadWaitRead (fromIntegral fd); unsafe_read + where + do_read call = throwErrnoIfMinus1RetryMayBlock loc call + (threadWaitRead (fromIntegral fd)) + unsafe_read = do_read (read_off fd buf off len) + safe_read = do_read (safe_read_off fd buf off len) + +readRawBufferNoBlock :: String -> FD -> Bool -> RawBuffer -> Int -> CInt -> IO CInt +readRawBufferNoBlock loc fd is_nonblock buf off len + | is_nonblock = unsafe_read + | otherwise = do r <- fdReady (fromIntegral fd) 0 0 False + if r /= 0 then safe_read + else return 0 + -- XXX see note [nonblock] + where + do_read call = throwErrnoIfMinus1RetryOnBlock loc call (return 0) + unsafe_read = do_read (read_rawBuffer fd buf off len) + safe_read = do_read (safe_read_rawBuffer fd buf off len) writeRawBuffer :: String -> FD -> Bool -> RawBuffer -> Int -> CInt -> IO CInt -writeRawBuffer loc fd is_stream buf off len = - throwErrnoIfMinus1RetryMayBlock loc - (write_rawBuffer (fromIntegral fd) buf off len) - (threadWaitWrite (fromIntegral fd)) +writeRawBuffer loc fd is_nonblock buf off len + | is_nonblock = unsafe_write + | threaded = safe_write + | otherwise = do r <- fdReady (fromIntegral fd) 1 0 False + if r /= 0 + then safe_write + else do threadWaitWrite (fromIntegral fd); unsafe_write + where + do_write call = throwErrnoIfMinus1RetryMayBlock loc call + (threadWaitWrite (fromIntegral fd)) + unsafe_write = do_write (write_rawBuffer fd buf off len) + safe_write = do_write (safe_write_rawBuffer (fromIntegral fd) buf off len) writeRawBufferPtr :: String -> FD -> Bool -> Ptr CChar -> Int -> CInt -> IO CInt -writeRawBufferPtr loc fd is_stream buf off len = - throwErrnoIfMinus1RetryMayBlock loc - (write_off (fromIntegral fd) buf off len) - (threadWaitWrite (fromIntegral fd)) +writeRawBufferPtr loc fd is_nonblock buf off len + | is_nonblock = unsafe_write + | threaded = safe_write + | otherwise = do r <- fdReady (fromIntegral fd) 1 0 False + if r /= 0 + then safe_write + else do threadWaitWrite (fromIntegral fd); unsafe_write + where + do_write call = throwErrnoIfMinus1RetryMayBlock loc call + (threadWaitWrite (fromIntegral fd)) + unsafe_write = do_write (write_off fd buf off len) + safe_write = do_write (safe_write_off (fromIntegral fd) buf off len) foreign import ccall unsafe "__hscore_PrelHandle_read" - read_rawBuffer :: FD -> RawBuffer -> Int -> CInt -> IO CInt + read_rawBuffer :: CInt -> RawBuffer -> Int -> CInt -> IO CInt foreign import ccall unsafe "__hscore_PrelHandle_read" - read_off :: FD -> Ptr CChar -> Int -> CInt -> IO CInt + read_off :: CInt -> Ptr CChar -> Int -> CInt -> IO CInt foreign import ccall unsafe "__hscore_PrelHandle_write" write_rawBuffer :: CInt -> RawBuffer -> Int -> CInt -> IO CInt @@ -567,6 +633,9 @@ foreign import ccall unsafe "__hscore_PrelHandle_write" foreign import ccall unsafe "__hscore_PrelHandle_write" write_off :: CInt -> Ptr CChar -> Int -> CInt -> IO CInt +foreign import ccall safe "fdReady" + fdReady :: CInt -> CInt -> CInt -> Bool -> IO CInt + #else /* mingw32_HOST_OS.... */ readRawBuffer :: String -> FD -> Bool -> RawBuffer -> Int -> CInt -> IO CInt @@ -591,12 +660,12 @@ writeRawBufferPtr loc fd is_stream buf off len -- ToDo: we don't have a non-blocking primitve read on Win32 readRawBufferNoBlock :: String -> FD -> Bool -> RawBuffer -> Int -> CInt -> IO CInt -readRawBufferNoBlock = readRawBufferNoBlock +readRawBufferNoBlock = readRawBuffer -- Async versions of the read/write primitives, for the non-threaded RTS asyncReadRawBuffer loc fd is_stream buf off len = do - (l, rc) <- asyncReadBA fd (if is_stream then 1 else 0) + (l, rc) <- asyncReadBA (fromIntegral fd) (if is_stream then 1 else 0) (fromIntegral len) off buf if l == (-1) then @@ -604,7 +673,7 @@ asyncReadRawBuffer loc fd is_stream buf off len = do else return (fromIntegral l) asyncReadRawBufferPtr loc fd is_stream buf off len = do - (l, rc) <- asyncRead fd (if is_stream then 1 else 0) + (l, rc) <- asyncRead (fromIntegral fd) (if is_stream then 1 else 0) (fromIntegral len) (buf `plusPtr` off) if l == (-1) then @@ -612,7 +681,7 @@ asyncReadRawBufferPtr loc fd is_stream buf off len = do else return (fromIntegral l) asyncWriteRawBuffer loc fd is_stream buf off len = do - (l, rc) <- asyncWriteBA fd (if is_stream then 1 else 0) + (l, rc) <- asyncWriteBA (fromIntegral fd) (if is_stream then 1 else 0) (fromIntegral len) off buf if l == (-1) then @@ -620,7 +689,7 @@ asyncWriteRawBuffer loc fd is_stream buf off len = do else return (fromIntegral l) asyncWriteRawBufferPtr loc fd is_stream buf off len = do - (l, rc) <- asyncWrite fd (if is_stream then 1 else 0) + (l, rc) <- asyncWrite (fromIntegral fd) (if is_stream then 1 else 0) (fromIntegral len) (buf `plusPtr` off) if l == (-1) then @@ -631,62 +700,63 @@ asyncWriteRawBufferPtr loc fd is_stream buf off len = do blockingReadRawBuffer loc fd True buf off len = throwErrnoIfMinus1Retry loc $ - recv_rawBuffer fd buf off len + safe_recv_rawBuffer fd buf off len blockingReadRawBuffer loc fd False buf off len = throwErrnoIfMinus1Retry loc $ - read_rawBuffer fd buf off len + safe_read_rawBuffer fd buf off len blockingReadRawBufferPtr loc fd True buf off len = throwErrnoIfMinus1Retry loc $ - recv_off fd buf off len + safe_recv_off fd buf off len blockingReadRawBufferPtr loc fd False buf off len = throwErrnoIfMinus1Retry loc $ - read_off fd buf off len + safe_read_off fd buf off len blockingWriteRawBuffer loc fd True buf off len = throwErrnoIfMinus1Retry loc $ - send_rawBuffer (fromIntegral fd) buf off len + safe_send_rawBuffer fd buf off len blockingWriteRawBuffer loc fd False buf off len = throwErrnoIfMinus1Retry loc $ - write_rawBuffer (fromIntegral fd) buf off len + safe_write_rawBuffer fd buf off len blockingWriteRawBufferPtr loc fd True buf off len = throwErrnoIfMinus1Retry loc $ - send_off (fromIntegral fd) buf off len + safe_send_off fd buf off len blockingWriteRawBufferPtr loc fd False buf off len = throwErrnoIfMinus1Retry loc $ - write_off (fromIntegral fd) buf off len + safe_write_off fd buf off len -- NOTE: "safe" versions of the read/write calls for use by the threaded RTS. -- These calls may block, but that's ok. -foreign import ccall safe "__hscore_PrelHandle_read" - read_rawBuffer :: FD -> RawBuffer -> Int -> CInt -> IO CInt - -foreign import ccall safe "__hscore_PrelHandle_read" - read_off :: FD -> Ptr CChar -> Int -> CInt -> IO CInt - -foreign import ccall safe "__hscore_PrelHandle_write" - write_rawBuffer :: CInt -> RawBuffer -> Int -> CInt -> IO CInt - -foreign import ccall safe "__hscore_PrelHandle_write" - write_off :: CInt -> Ptr CChar -> Int -> CInt -> IO CInt - foreign import ccall safe "__hscore_PrelHandle_recv" - recv_rawBuffer :: FD -> RawBuffer -> Int -> CInt -> IO CInt + safe_recv_rawBuffer :: CInt -> RawBuffer -> Int -> CInt -> IO CInt foreign import ccall safe "__hscore_PrelHandle_recv" - recv_off :: FD -> Ptr CChar -> Int -> CInt -> IO CInt + safe_recv_off :: CInt -> Ptr CChar -> Int -> CInt -> IO CInt foreign import ccall safe "__hscore_PrelHandle_send" - send_rawBuffer :: CInt -> RawBuffer -> Int -> CInt -> IO CInt + safe_send_rawBuffer :: CInt -> RawBuffer -> Int -> CInt -> IO CInt foreign import ccall safe "__hscore_PrelHandle_send" - send_off :: CInt -> Ptr CChar -> Int -> CInt -> IO CInt + safe_send_off :: CInt -> Ptr CChar -> Int -> CInt -> IO CInt -foreign import ccall "rtsSupportsBoundThreads" threaded :: Bool #endif +foreign import ccall "rtsSupportsBoundThreads" threaded :: Bool + +foreign import ccall safe "__hscore_PrelHandle_read" + safe_read_rawBuffer :: FD -> RawBuffer -> Int -> CInt -> IO CInt + +foreign import ccall safe "__hscore_PrelHandle_read" + safe_read_off :: FD -> Ptr CChar -> Int -> CInt -> IO CInt + +foreign import ccall safe "__hscore_PrelHandle_write" + safe_write_rawBuffer :: CInt -> RawBuffer -> Int -> CInt -> IO CInt + +foreign import ccall safe "__hscore_PrelHandle_write" + safe_write_off :: CInt -> Ptr CChar -> Int -> CInt -> IO CInt + -- --------------------------------------------------------------------------- -- Standard Handles @@ -703,7 +773,9 @@ fd_stderr = 2 :: FD stdin :: Handle stdin = unsafePerformIO $ do -- ToDo: acquire lock - setNonBlockingFD fd_stdin + -- We don't set non-blocking mode on standard handles, because it may + -- confuse other applications attached to the same TTY/pipe + -- see Note [nonblock] (buf, bmode) <- getBuffer fd_stdin ReadBuffer mkStdHandle fd_stdin "" ReadHandle buf bmode @@ -711,9 +783,9 @@ stdin = unsafePerformIO $ do stdout :: Handle stdout = unsafePerformIO $ do -- ToDo: acquire lock - -- We don't set non-blocking mode on stdout or sterr, because - -- some shells don't recover properly. - -- setNonBlockingFD fd_stdout + -- We don't set non-blocking mode on standard handles, because it may + -- confuse other applications attached to the same TTY/pipe + -- see Note [nonblock] (buf, bmode) <- getBuffer fd_stdout WriteBuffer mkStdHandle fd_stdout "" WriteHandle buf bmode @@ -721,9 +793,9 @@ stdout = unsafePerformIO $ do stderr :: Handle stderr = unsafePerformIO $ do -- ToDo: acquire lock - -- We don't set non-blocking mode on stdout or sterr, because - -- some shells don't recover properly. - -- setNonBlockingFD fd_stderr + -- We don't set non-blocking mode on standard handles, because it may + -- confuse other applications attached to the same TTY/pipe + -- see Note [nonblock] buf <- mkUnBuffer mkStdHandle fd_stderr "" WriteHandle buf NoBuffering @@ -806,21 +878,26 @@ openFile' filepath mode binary = -- directories. However, the man pages I've read say that open() -- always returns EISDIR if the file is a directory and was opened -- for writing, so I think we're ok with a single open() here... - fd <- fromIntegral `liftM` - throwErrnoIfMinus1Retry "openFile" + fd <- throwErrnoIfMinus1Retry "openFile" (c_open f (fromIntegral oflags) 0o666) - h <- openFd fd Nothing False filepath mode binary - `catchException` \e -> do c_close (fromIntegral fd); throw e + fd_type <- fdType fd + + h <- openFd fd (Just fd_type) False filepath mode binary + `catchException` \e -> do c_close fd; throw e -- NB. don't forget to close the FD if openFd fails, otherwise -- this FD leaks. -- ASSERT: if we just created the file, then openFd won't fail -- (so we don't need to worry about removing the newly created file -- in the event of an error). + #ifndef mingw32_HOST_OS - if mode == WriteMode + -- we want to truncate() if this is an open in WriteMode, but only + -- if the target is a RegularFile. ftruncate() fails on special files + -- like /dev/null. + if mode == WriteMode && fd_type == RegularFile then throwErrnoIf (/=0) "openFile" - (c_ftruncate (fromIntegral fd) 0) + (c_ftruncate fd 0) else return 0 #endif return h @@ -864,13 +941,19 @@ openTempFile' loc tmp_dir template binary = do then findTempName (x+1) else ioError (errnoToIOError loc errno Nothing (Just tmp_dir)) else do - h <- openFd (fromIntegral fd) Nothing False filepath ReadWriteMode True - `catchException` \e -> do c_close (fromIntegral fd); throw e + h <- openFd fd Nothing False filepath ReadWriteMode True + `catchException` \e -> do c_close fd; throw e return (filepath, h) where filename = prefix ++ show x ++ suffix - filepath = tmp_dir `joinFileName` filename + filepath = tmp_dir ++ [pathSeparator] ++ filename +pathSeparator :: Char +#ifdef mingw32_HOST_OS +pathSeparator = '\\' +#else +pathSeparator = '/' +#endif std_flags = o_NONBLOCK .|. o_NOCTTY output_flags = std_flags .|. o_CREAT @@ -887,6 +970,14 @@ openFd fd mb_fd_type is_socket filepath mode binary = do -- turn on non-blocking mode setNonBlockingFD fd +#ifdef mingw32_HOST_OS + -- On Windows, the is_stream flag indicates that the Handle is a socket + let is_stream = is_socket +#else + -- On Unix, the is_stream flag indicates that the FD is non-blocking + let is_stream = True +#endif + let (ha_type, write) = case mode of ReadMode -> ( ReadHandle, False ) @@ -906,20 +997,26 @@ openFd fd mb_fd_type is_socket filepath mode binary = do ioException (IOError Nothing InappropriateType "openFile" "is a directory" Nothing) - Stream - | ReadWriteHandle <- ha_type -> mkDuplexHandle fd is_socket filepath binary - | otherwise -> mkFileHandle fd is_socket filepath ha_type binary - -- regular files need to be locked RegularFile -> do #ifndef mingw32_HOST_OS - r <- lockFile (fromIntegral fd) (fromBool write) 1{-exclusive-} + r <- lockFile fd (fromBool write) 1{-exclusive-} when (r == -1) $ ioException (IOError Nothing ResourceBusy "openFile" "file is locked" Nothing) #endif - mkFileHandle fd is_socket filepath ha_type binary + mkFileHandle fd is_stream filepath ha_type binary + Stream + -- only *Streams* can be DuplexHandles. Other read/write + -- Handles must share a buffer. + | ReadWriteHandle <- ha_type -> + mkDuplexHandle fd is_stream filepath binary + | otherwise -> + mkFileHandle fd is_stream filepath ha_type binary + + RawDevice -> + mkFileHandle fd is_stream filepath ha_type binary fdToHandle :: FD -> IO Handle fdToHandle fd = do @@ -944,7 +1041,7 @@ mkStdHandle fd filepath ha_type buf bmode = do (Handle__ { haFD = fd, haType = ha_type, haIsBin = dEFAULT_OPEN_IN_BINARY_MODE, - haIsStream = False, + haIsStream = False, -- means FD is blocking on Unix haBufferMode = bmode, haBuffer = buf, haBuffers = spares, @@ -954,6 +1051,17 @@ mkStdHandle fd filepath ha_type buf bmode = do mkFileHandle :: FD -> Bool -> FilePath -> HandleType -> Bool -> IO Handle mkFileHandle fd is_stream filepath ha_type binary = do (buf, bmode) <- getBuffer fd (initBufferState ha_type) + +#ifdef mingw32_HOST_OS + -- On Windows, if this is a read/write handle and we are in text mode, + -- turn off buffering. We don't correctly handle the case of switching + -- from read mode to write mode on a buffered text-mode handle, see bug + -- \#679. + bmode <- case ha_type of + ReadWriteHandle | not binary -> return NoBuffering + _other -> return bmode +#endif + spares <- newIORef BufferListNil newFileHandle filepath (handleFinalizer filepath) (Handle__ { haFD = fd, @@ -1035,17 +1143,16 @@ hClose_help handle_ = hClose_handle_ handle_ = do let fd = haFD handle_ - c_fd = fromIntegral fd -- close the file descriptor, but not when this is the read -- side of a duplex handle. case haOtherSide handle_ of - Nothing -> + Nothing -> throwErrnoIfMinus1Retry_ "hClose" #ifdef mingw32_HOST_OS - (closeFd (haIsStream handle_) c_fd) + (closeFd (haIsStream handle_) fd) #else - (c_close c_fd) + (c_close fd) #endif Just _ -> return () @@ -1054,7 +1161,7 @@ hClose_handle_ handle_ = do #ifndef mingw32_HOST_OS -- unlock it - unlockFile c_fd + unlockFile fd #endif -- we must set the fd to -1, because the finalizer is going @@ -1093,7 +1200,7 @@ hSetFileSize handle size = SemiClosedHandle -> ioe_closedHandle _ -> do flushWriteBufferOnly handle_ throwErrnoIf (/=0) "hSetFileSize" - (c_ftruncate (fromIntegral (haFD handle_)) (fromIntegral size)) + (c_ftruncate (haFD handle_) (fromIntegral size)) return () -- --------------------------------------------------------------------------- @@ -1137,7 +1244,7 @@ hLookAhead handle = do -- fill up the read buffer if necessary new_buf <- if bufferEmpty buf - then fillReadBuffer fd is_line (haIsStream handle_) buf + then fillReadBuffer fd True (haIsStream handle_) buf else return buf writeIORef ref new_buf @@ -1208,6 +1315,8 @@ hSetBuffering handle mode = -- 'raw' mode under win32 is a bit too specialised (and troublesome -- for most common uses), so simply disable its use here. NoBuffering -> setCooked (haFD handle_) False +#else + NoBuffering -> return () #endif _ -> setCooked (haFD handle_) True @@ -1330,7 +1439,7 @@ hSeek handle mode offset = let do_seek = throwErrnoIfMinus1Retry_ "hSeek" - (c_lseek (fromIntegral (haFD handle_)) (fromIntegral offset) whence) + (c_lseek (haFD handle_) (fromIntegral offset) whence) whence :: CInt whence = case mode of @@ -1363,7 +1472,7 @@ hTell handle = -- current buffer size. Just flush instead. flushBuffer handle_ #endif - let fd = fromIntegral (haFD handle_) + let fd = haFD handle_ posn <- fromIntegral `liftM` throwErrnoIfMinus1Retry "hGetPosn" (c_lseek fd 0 sEEK_CUR) @@ -1451,9 +1560,8 @@ hIsSeekable handle = SemiClosedHandle -> ioe_closedHandle AppendHandle -> return False _ -> do t <- fdType (haFD handle_) - return (t == RegularFile - && (haIsBin handle_ - || tEXT_MODE_SEEK_ALLOWED)) + return ((t == RegularFile || t == RawDevice) + && (haIsBin handle_ || tEXT_MODE_SEEK_ALLOWED)) -- ----------------------------------------------------------------------------- -- Changing echo status (Non-standard GHC extensions) @@ -1503,7 +1611,7 @@ hSetBinaryMode :: Handle -> Bool -> IO () hSetBinaryMode handle bin = withAllHandles__ "hSetBinaryMode" handle $ \ handle_ -> do throwErrnoIfMinus1_ "hSetBinaryMode" - (setmode (fromIntegral (haFD handle_)) bin) + (setmode (haFD handle_) bin) return handle_{haIsBin=bin} foreign import ccall unsafe "__hscore_setmode" @@ -1519,35 +1627,41 @@ foreign import ccall unsafe "__hscore_setmode" hDuplicate :: Handle -> IO Handle hDuplicate h@(FileHandle path m) = do - new_h_ <- withHandle' "hDuplicate" h m (dupHandle Nothing) + new_h_ <- withHandle' "hDuplicate" h m (dupHandle h Nothing) newFileHandle path (handleFinalizer path) new_h_ hDuplicate h@(DuplexHandle path r w) = do - new_w_ <- withHandle' "hDuplicate" h w (dupHandle Nothing) + new_w_ <- withHandle' "hDuplicate" h w (dupHandle h Nothing) new_w <- newMVar new_w_ - new_r_ <- withHandle' "hDuplicate" h r (dupHandle (Just new_w)) + new_r_ <- withHandle' "hDuplicate" h r (dupHandle h (Just new_w)) new_r <- newMVar new_r_ addMVarFinalizer new_w (handleFinalizer path new_w) return (DuplexHandle path new_r new_w) -dupHandle other_side h_ = do +dupHandle :: Handle -> Maybe (MVar Handle__) -> Handle__ + -> IO (Handle__, Handle__) +dupHandle h other_side h_ = do -- flush the buffer first, so we don't have to copy its contents flushBuffer h_ - new_fd <- throwErrnoIfMinus1 "dupHandle" $ - c_dup (fromIntegral (haFD h_)) + new_fd <- case other_side of + Nothing -> throwErrnoIfMinus1 "dupHandle" $ c_dup (haFD h_) + Just r -> withHandle_' "dupHandle" h r (return . haFD) dupHandle_ other_side h_ new_fd dupHandleTo other_side hto_ h_ = do flushBuffer h_ - new_fd <- throwErrnoIfMinus1 "dupHandleTo" $ - c_dup2 (fromIntegral (haFD h_)) (fromIntegral (haFD hto_)) - dupHandle_ other_side h_ new_fd + -- Windows' dup2 does not return the new descriptor, unlike Unix + throwErrnoIfMinus1 "dupHandleTo" $ + c_dup2 (haFD h_) (haFD hto_) + dupHandle_ other_side h_ (haFD hto_) +dupHandle_ :: Maybe (MVar Handle__) -> Handle__ -> FD + -> IO (Handle__, Handle__) dupHandle_ other_side h_ new_fd = do buffer <- allocateBuffer dEFAULT_BUFFER_SIZE (initBufferState (haType h_)) ioref <- newIORef buffer ioref_buffers <- newIORef BufferListNil - let new_handle_ = h_{ haFD = fromIntegral new_fd, + let new_handle_ = h_{ haFD = new_fd, haBuffer = ioref, haBuffers = ioref_buffers, haOtherSide = other_side } @@ -1628,10 +1742,10 @@ showHandle' filepath is_duplex h = -- --------------------------------------------------------------------------- -- debugging -#ifdef DEBUG_DUMP +#if defined(DEBUG_DUMP) puts :: String -> IO () -puts s = withCString s $ \cstr -> do write_rawBuffer 1 False cstr 0 (fromIntegral (length s)) - return () +puts s = do write_rawBuffer 1 (unsafeCoerce# (packCString# s)) 0 (fromIntegral (length s)) + return () #endif -- -----------------------------------------------------------------------------