--- gforth/prim	2009/04/20 19:11:11	1.240
+++ gforth/prim	2009/12/31 15:32:35	1.245
@@ -1,6 +1,6 @@
 \ Gforth primitives
 
-\ Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -1836,13 +1836,15 @@ wior = IOR(ftruncate(fileno((FILE *)wfil
 read-file	( c_addr u1 wfileid -- u2 wior )	file	read_file
 /* !! fread does not guarantee enough */
 u2 = fread(c_addr, sizeof(Char), u1, (FILE *)wfileid);
+if (u2>0)
+   gf_regetc((FILE *)wfileid);
 wior = FILEIO(u2<u1 && ferror((FILE *)wfileid));
 /* !! is the value of ferror errno-compatible? */
 if (wior)
   clearerr((FILE *)wfileid);
 
 (read-line)	( c_addr u1 wfileid -- u2 flag u3 wior ) file	paren_read_line
-struct Cellquad r = read_line(c_addr, u1, wfileid);
+struct Cellquad r = read_line(c_addr, u1, (FILE *)wfileid);
 u2   = r.n1;
 flag = r.n2;
 u3   = r.n3;
@@ -2150,10 +2152,7 @@ int flag;
 int decpt;
 sig=ecvt(r, u, &decpt, &flag);
 n=(r==0. ? 1 : decpt);
-#ifdef DARWIN
-// workaround Mac OS X bug in ecvt
-flag=signbit(r);
-#endif
+flag=signbit(r); /* not all ecvt()s do this as desired */
 f1=FLAG(flag!=0);
 f2=FLAG(isdigit((unsigned)(sig[0]))!=0);
 siglen=strlen((char *)sig);
@@ -2466,6 +2465,9 @@ lib-error ( -- c_addr u )       gforth
 #ifdef HAVE_LIBLTDL
 c_addr = (Char *)lt_dlerror();
 u = (c_addr == NULL) ? 0 : strlen((char *)c_addr);
+#elif defined(HAVE_LIBDL) || defined(HAVE_DLOPEN)
+c_addr = dlerror();
+u = strlen(c_addr);
 #else
 c_addr = "libltdl is not configured";
 u = strlen(c_addr);