From: sof <unknown>
Date: Tue, 11 Aug 1998 21:40:37 +0000 (+0000)
Subject: [project @ 1998-08-11 21:40:32 by sof]
X-Git-Tag: Approx_2487_patches~451
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=e51e1225b4bd3c2436a095f52da89c323913b5f2;p=ghc-hetmet.git

[project @ 1998-08-11 21:40:32 by sof]
Drop -syslib posix deps
---

diff --git a/ghc/lib/misc/BSD.lhs b/ghc/lib/misc/BSD.lhs
index 39c7887..291012e 100644
--- a/ghc/lib/misc/BSD.lhs
+++ b/ghc/lib/misc/BSD.lhs
@@ -79,7 +79,7 @@ import Foreign
 import Addr
 import PackedString ( cByteArrayToPS, unpackPS, unpackCStringIO )
   
-import PosixUtil  ( unvectorize )
+import Util  ( unvectorize )
 import SocketPrim
 
 \end{code}
@@ -474,4 +474,5 @@ unvectorizeHostAddrs ptr n  = do
 	   xs <- unvectorizeHostAddrs ptr (n+1)
 	   return (x : xs)
 
+
 \end{code}
diff --git a/ghc/lib/misc/Makefile b/ghc/lib/misc/Makefile
index 28b60c9..7dc4bf5 100644
--- a/ghc/lib/misc/Makefile
+++ b/ghc/lib/misc/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.8 1998/05/19 10:35:32 simonm Exp $
+# $Id: Makefile,v 1.9 1998/08/11 21:40:34 sof Exp $
 #
 # Makefile for miscellaneous libraries.
 #
@@ -54,14 +54,14 @@ endif
 #
 # Specific flags
 #
-BSD_HC_OPTS        += -syslib posix -optc-DNON_POSIX_SOURCE
+BSD_HC_OPTS        += -optc-DNON_POSIX_SOURCE
 Socket_HC_OPTS     += -I../std/cbits -syslib posix -optc-DNON_POSIX_SOURCE
-SocketPrim_HC_OPTS += -I../std/cbits -H10m -syslib posix -optc-DNON_POSIX_SOURCE
+SocketPrim_HC_OPTS += -I../std/cbits -H10m -optc-DNON_POSIX_SOURCE
 
 #-----------------------------------------------------------------------------
 # 	Dependency generation
 
-SRC_MKDEPENDHS_OPTS += -syslib posix -I$(GHC_INCLUDE_DIR)
+SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR)
 
 #-----------------------------------------------------------------------------
 # 	Installation; need to install .hi files as well as libraries
diff --git a/ghc/lib/misc/PackedString.lhs b/ghc/lib/misc/PackedString.lhs
index 752891a..2334b2f 100644
--- a/ghc/lib/misc/PackedString.lhs
+++ b/ghc/lib/misc/PackedString.lhs
@@ -1098,7 +1098,9 @@ unpackCString# addr
 	ch = indexCharOffAddr# addr nh
 
 unpackCStringIO :: Addr -> IO String
-unpackCStringIO addr = unpack 0#
+unpackCStringIO addr
+ | addr == ``NULL'' = return ""
+ | otherwise        = unpack 0#
   where
     unpack nh = do
        ch <- readCharOffAddr addr (I# nh)
diff --git a/ghc/lib/misc/SocketPrim.lhs b/ghc/lib/misc/SocketPrim.lhs
index 90b354a..a10ab13 100644
--- a/ghc/lib/misc/SocketPrim.lhs
+++ b/ghc/lib/misc/SocketPrim.lhs
@@ -83,8 +83,6 @@ import PrelIOBase  -- IOError, Handle representation
 import PrelHandle
 import Foreign
 
-import Posix
-import PosixUtil
 import IO
 import IOExts	    ( IORef, newIORef, readIORef, writeIORef )
 import PackedString ( unpackNBytesPS, byteArrayToPS,