--- gforth/prim	2006/03/11 23:05:09	1.191
+++ gforth/prim	2006/06/09 15:51:24	1.195
@@ -1646,31 +1646,43 @@ n=1;
 
 \g hostos
 
-key-file	( wfileid -- n )		gforth	paren_key_file
+key-file	( wfileid -- c )		gforth	paren_key_file
+""Read one character @i{c} from @i{wfileid}.  This word disables
+buffering for @i{wfileid}.  If you want to read characters from a
+terminal in non-canonical (raw) mode, you have to put the terminal in
+non-canonical mode yourself (using the C interface); the exception is
+@code{stdin}: Gforth automatically puts it into non-canonical mode.""
 #ifdef HAS_FILE
 fflush(stdout);
-n = key((FILE*)wfileid);
+c = key((FILE*)wfileid);
 #else
-n = key(stdin);
+c = key(stdin);
 #endif
 
-key?-file	( wfileid -- n )	        gforth	key_q_file
+key?-file	( wfileid -- f )	        gforth	key_q_file
+""@i{f} is true if at least one character can be read from @i{wfileid}
+without blocking.  If you also want to use @code{read-file} or
+@code{read-line} on the file, you have to call @code{key?-file} or
+@code{key-file} first (these two words disable buffering).""
 #ifdef HAS_FILE
 fflush(stdout);
-n = key_query((FILE*)wfileid);
+f = key_query((FILE*)wfileid);
 #else
-n = key_query(stdin);
+f = key_query(stdin);
 #endif
 
 \+os
 
 stdin	( -- wfileid )	gforth
+""The standard input file of the Gforth process.""
 wfileid = (Cell)stdin;
 
 stdout	( -- wfileid )	gforth
+""The standard output file of the Gforth process.""
 wfileid = (Cell)stdout;
 
 stderr	( -- wfileid )	gforth
+""The standard error output file of the Gforth process.""
 wfileid = (Cell)stderr;
 
 form	( -- urows ucols )	gforth
@@ -2686,7 +2698,7 @@ w = ffi_prep_closure((ffi_closure *)a_cl
 
 ffi-2@ ( a_addr -- d )	gforth ffi_2fetch
 #ifdef BUGGY_LONG_LONG
-DLO_IS(d, (Cell*)(*a_addr));
+DLO_IS(d, *(Cell*)(*a_addr));
 DHI_IS(d, 0);
 #else
 d = *(DCell*)(a_addr);
@@ -2702,14 +2714,25 @@ ffi-2! ( d a_addr -- )	gforth ffi_2store
 ffi-arg-int ( -- w )	gforth ffi_arg_int
 w = *(int *)(*gforth_clist++);
 
+ffi-arg-long ( -- w )	gforth ffi_arg_long
+w = *(long *)(*gforth_clist++);
+
 ffi-arg-longlong ( -- d )	gforth ffi_arg_longlong
 #ifdef BUGGY_LONG_LONG
-DLO_IS(d, (Cell*)(*gforth_clist++));
-DHI_IS(d, 0);
+DLO_IS(d, *(Cell*)(*gforth_clist++));
+DHI_IS(d, -(*(Cell*)(*gforth_clist++)<0));
 #else
 d = *(DCell*)(*gforth_clist++);
 #endif
 
+ffi-arg-dlong ( -- d )	gforth ffi_arg_dlong
+#ifdef BUGGY_LONG_LONG
+DLO_IS(d, *(Cell*)(*gforth_clist++));
+DHI_IS(d, -(*(Cell*)(*gforth_clist++)<0));
+#else
+d = *(Cell*)(*gforth_clist++);
+#endif
+
 ffi-arg-ptr ( -- c_addr )	gforth ffi_arg_ptr
 c_addr = *(Char **)(*gforth_clist++);
 
@@ -2734,6 +2757,22 @@ ffi-ret-longlong ( d -- )	gforth ffi_ret
 #endif
 return 0;
 
+ffi-ret-dlong ( d -- )	gforth ffi_ret_dlong
+#ifdef BUGGY_LONG_LONG
+*(Cell*)(gforth_ritem) = DLO(d);
+#else
+*(Cell*)(gforth_ritem) = d;
+#endif
+return 0;
+
+ffi-ret-long ( n -- )	gforth ffi_ret_long
+#ifdef BUGGY_LONG_LONG
+*(Cell*)(gforth_ritem) = DLO(n);
+#else
+*(Cell*)(gforth_ritem) = n;
+#endif
+return 0;
+
 ffi-ret-ptr ( c_addr -- )	gforth ffi_ret_ptr
 *(Char **)(gforth_ritem) = c_addr;
 return 0;