[project @ 1998-02-02 17:27:26 by simonm]

Library re-organisation:

All libraries now live under ghc/lib, which has the following structure:

	ghc/lib/std    		--  all prelude files 		(libHS.a)
	ghc/lib/std/cbits

	ghc/lib/exts		-- standard Hugs/GHC extensions (libHSexts.a)
				-- available with '-fglasgow-exts'

	ghc/lib/posix		-- POSIX library                (libHSposix.a)
	ghc/lib/posix/cbits     -- available with '-syslib posix'

	ghc/lib/misc		-- used to be hslibs/ghc	(libHSmisc.a)
	ghc/lib/misc/cbits	-- available with '-syslib misc'

	ghc/lib/concurrent	-- Concurrent libraries		(libHSconc.a)
				-- available with '-concurrent'

Also, several non-standard prelude modules had their names changed to begin
with 'Prel' to reduce namespace pollution.

	Addr      ==> PrelAddr     (Addr interface available in 'exts')
	ArrBase   ==> PrelArr
	CCall     ==> PrelCCall    (CCall interface available in 'exts')
	ConcBase  ==> PrelConc
	GHCerr    ==> PrelErr
	Foreign   ==> PrelForeign  (Foreign interface available in 'exts')
	GHC       ==> PrelGHC
	IOHandle  ==> PrelHandle
	IOBase    ==> PrelIOBase
	GHCmain   ==> PrelMain
	STBase    ==> PrelST
	Unsafe    ==> PrelUnsafe
	UnsafeST  ==> PrelUnsafeST

1 files changed, 102 insertions, 0 deletions

diff --git a/ghc/lib/std/cbits/readFile.lc b/ghc/lib/std/cbits/readFile.lc
new file mode 100644
index 0000000000..0cc9c2c7b9
--- /dev/null
+++ b/ghc/lib/std/cbits/readFile.lc
@@ -0,0 +1,102 @@
+%
+% (c) The GRASP/AQUA Project, Glasgow University, 1994
+%
+\subsection[readFile.lc]{hGetContents Runtime Support}
+
+\begin{code}
+
+#include "rtsdefs.h"
+#include "stgio.h"
+
+#define EOT 4
+
+StgInt
+readBlock(buf, fp, size)
+StgAddr buf;
+StgForeignObj fp;
+StgInt size;
+{
+    int count;
+
+    if (feof((FILE *) fp)) {
+	ghc_errtype = ERR_EOF;
+	ghc_errstr = "";
+	return -1;
+    }
+
+    while ((count = fread(buf, 1, size, (FILE *) fp)) == 0) {
+	if (feof((FILE *) fp)) {
+	    ghc_errtype = ERR_EOF;
+	    ghc_errstr = "";
+	    return -1;
+	} else if (errno != EINTR) {
+	    cvtErrno();
+	    stdErrno();
+	    return -1;
+	}
+	clearerr((FILE *) fp);
+    }
+
+    return count;
+}
+
+StgInt
+readLine(buf, fp, size)
+StgAddr buf;
+StgForeignObj fp;
+StgInt size;
+{
+    if (feof((FILE *) fp)) {
+	ghc_errtype = ERR_EOF;
+	ghc_errstr = "";
+	return -1;
+    }
+
+    while (fgets(buf, size, (FILE *) fp) == NULL) {
+	if (feof((FILE *) fp)) {
+	    ghc_errtype = ERR_EOF;
+	    ghc_errstr = "";
+	    return -1;
+	} else if (errno != EINTR) {
+	    cvtErrno();
+	    stdErrno();
+	    return -1;
+	}
+	clearerr((FILE *) fp);
+    }
+
+    return strlen(buf);
+}
+
+StgInt
+readChar(fp)
+StgForeignObj fp;
+{
+    int c;
+
+    if (feof((FILE *) fp)) {
+	ghc_errtype = ERR_EOF;
+	ghc_errstr = "";
+	return -1;
+    }
+
+    while ((c = getc((FILE *) fp)) == EOF) {
+	if (feof((FILE *) fp)) {
+	    ghc_errtype = ERR_EOF;
+	    ghc_errstr = "";
+	    return -1;
+	} else if (errno != EINTR) {
+	    cvtErrno();
+	    stdErrno();
+	    return -1;
+	}
+	clearerr((FILE *) fp);
+    }
+
+    if (isatty(fileno((FILE *) fp)) && c == EOT) 
+	return EOF;
+    else
+        return c;
+}
+
+\end{code}