From: simonmar <unknown>
Date: Tue, 21 Oct 2003 14:00:20 +0000 (+0000)
Subject: [project @ 2003-10-21 14:00:20 by simonmar]
X-Git-Tag: nhc98-1-18-release~462
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=e572bcd19276d282590e158d7a8e5761e4b1d697;p=ghc-base.git

[project @ 2003-10-21 14:00:20 by simonmar]
oops, revert parts of previous commit that weren't supposed to be included.
---

diff --git a/GHC/IO.hs b/GHC/IO.hs
index 830889e..33aeaf9 100644
--- a/GHC/IO.hs
+++ b/GHC/IO.hs
@@ -869,103 +869,6 @@ slurpFile fname = do
     return (chunk, r)
 
 -- ---------------------------------------------------------------------------
--- pipes
-
-{-| 
-(@createPipe@) creates an anonymous /pipe/ and returns a pair of 
-handles, the first for reading and the second for writing. Both
-pipe ends can be inherited by a child process.
-
-> createPipe  = createPipeEx (BinaryMode AppendMode)   
--}
-createPipe :: IO (Handle,Handle)
-createPipe = createPipeEx AppendMode
-
-{-| 
-(@createPipeEx modeEx@) creates an anonymous /pipe/ and returns a pair of 
-handles, the first for reading and the second for writing. 
-The pipe mode @modeEx@ can be:
-  
-  * @'TextMode' mode@ -- the pipe is opened in text mode.
-  
-  * @'BinaryMode' mode@ -- the pipe is opened in binary mode.
-
-The @mode@ determines if child processes can inherit the pipe handles:
-
-  * 'ReadMode' -- The /read/ handle of the pipe is private to this process. 
-
-  * 'WriteMode' -- The /write/ handle of the pipe is private to this process. 
-  
-  * 'ReadWriteMode' -- Both handles are private to this process.
-  
-  * 'AppendMode' -- Both handles are available (inheritable) to child processes.
-      This mode can be used to /append/ (|) two seperate child processes.
-            
-If a broken pipe is read, an end-of-file ('GHC.IOBase.EOF') 
-exception is raised. If a broken pipe is written to, an invalid argument exception
-is raised ('GHC.IOBase.InvalidArgument').
--}
-createPipeEx :: IOMode -> IO (Handle,Handle)
-createPipeEx mode = do
-#if 1
-  return (error "createPipeEx")
-#else
-
-#ifndef mingw32_TARGET_OS
-  -- ignore modeEx for Unix: just always inherit the descriptors
-  allocaArray 2 $ \p -> do
-    throwErrnoIfMinus1 "createPipe" (c_pipe p)
-    r <- peekElemOff p 0
-    hr <- openFd (fromIntegral r) (Just Stream) ("<fd="++show r++")>") ReadMode 
-		False{-text mode-} False{-don't truncate-}
-    w <- peekElemOff p 1
-    hw <- openFd (fromIntegral w) (Just Stream) ("<fd="++show r++")>") WriteMode 
-		False{-text mode-} False{-don't truncate-}
-    return (hr,hw)
-#else
-
-    alloca $ \pFdRead ->
-    alloca $ \pFdWrite ->
-    do{ r <- winCreatePipe (fromIntegral textmode) (fromIntegral inherit) 4096 pFdRead pFdWrite
-      ; when (r/=0) (ioError (userError ("unable to create pipe")))
-      ; fdRead  <- do{ fd <- peek pFdRead
-                     ; case mode of
-                         WriteMode     -> inheritFd fd  -- a child process must be able to read from it
-                         other         -> return fd
-                     }
-      ; fdWrite <- do{ fd <- peek pFdWrite
-                     ; case mode of
-                         ReadMode      -> inheritFd fd  -- a child process must be able to write to it
-                         other         -> return fd
-                     }
-      ; hRead  <- openFd (fromIntegral fd) (Just Stream)
-         		"<pipe(read)>" ReadMode textmode False
-      ; hWrite <- openFd (fromIntegral fd) (Just Stream)
-         		"<pipe(write)>" WriteMode textmode False
-      ; return (hRead,hWrite)
-      }
-  where   
-    (mode,textmode) = case modeEx of
-                        TextMode mode   -> (mode,1::Int)
-                        BinaryMode mode -> (mode,0::Int)
-
-    inherit :: Int
-    inherit         = case mode of
-                        ReadMode      -> 0    -- not inheritable
-                        WriteMode     -> 0    -- not inheritable
-                        ReadWriteMode -> 0    -- not inheritable
-                        AppendMode    -> 1    -- both inheritable
-
-inheritFd :: CInt -> IO CInt
-inheritFd fd0
-  = do{ fd1 <- c_dup fd0  -- dup() makes a file descriptor inheritable
-      ; c_close fd0
-      ; return fd1
-      }
-#endif
-#endif /* mingw32_TARGET_OS */
-
--- ---------------------------------------------------------------------------
 -- memcpy wrappers
 
 foreign import ccall unsafe "__hscore_memcpy_src_off"