--- gforth/Attic/engine.c	1996/04/17 16:39:40	1.37
+++ gforth/Attic/engine.c	1997/02/16 20:51:07	1.40
@@ -56,22 +56,10 @@ typedef struct F83Name {
 #define F83NAME_SMUDGE(np)	(((np)->countetc & 0x40) != 0)
 #define F83NAME_IMMEDIATE(np)	(((np)->countetc & 0x20) != 0)
 
-#ifdef USE_TOS
-#define IF_TOS(x) x
-#else
-#define IF_TOS(x)
-#define TOS (sp[0])
-#endif
-
-#ifdef USE_FTOS
-#define IF_FTOS(x) x
-#else
-#define IF_FTOS(x)
-#define FTOS (fp[0])
-#endif
-
 Cell *SP;
 Float *FP;
+Address UP=NULL;
+
 #if 0
 /* not used currently */
 int emitcounter;
@@ -121,10 +109,12 @@ char *tilde_cstr(Char *from, UCell size,
     return cstr(from, size, clear);
   if (size<2 || from[1]=='/') {
     s1 = (char *)getenv ("HOME");
+    if(s1 == NULL)
+      s1 = "";
     s2 = from+1;
     s2_len = size-1;
   } else {
-    int i;
+    UCell i;
     for (i=1; i<size && from[i]!='/'; i++)
       ;
     {
@@ -159,7 +149,17 @@ char *tilde_cstr(Char *from, UCell size,
 
 static char* fileattr[6]={"r","rb","r+","r+b","w","wb"};
 
-static Address up0=NULL;
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+#ifndef O_TEXT
+#define O_TEXT 0
+#endif
+
+static int ufileattr[6]= {
+  O_RDONLY|O_TEXT, O_RDONLY|O_BINARY,
+  O_RDWR  |O_TEXT, O_RDWR  |O_BINARY,
+  O_WRONLY|O_TEXT, O_WRONLY|O_BINARY };
 
 /* if machine.h has not defined explicit registers, define them as implicit */
 #ifndef IPREG
@@ -211,7 +211,7 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
 #ifdef CFA_NEXT
   register Xt cfa CFAREG;
 #endif
-  register Address up UPREG = up0;
+  register Address up UPREG = UP;
   IF_TOS(register Cell TOS TOSREG;)
   IF_FTOS(register Float FTOS FTOSREG;)
   static Label symbols[]= {