--- gforth/Attic/kernal.fs	1995/04/20 09:42:55	1.35
+++ gforth/Attic/kernal.fs	1995/06/07 10:05:06	1.38
@@ -1215,24 +1215,47 @@ create nl$ 1 c, A c, 0 c, \ gnu includes
 
 create pathfilenamebuf 256 chars allot \ !! make this grow on demand
 
+\ : check-file-prefix  ( addr len -- addr' len' flag )
+\   dup 0=                    IF  true EXIT  THEN 
+\   over c@ '/ =              IF  true EXIT  THEN 
+\   over 2 S" ./" compare 0=  IF  true EXIT  THEN 
+\   over 3 S" ../" compare 0= IF  true EXIT  THEN
+\   over 2 S" ~/" compare 0=
+\   IF     1 /string
+\          S" HOME" getenv tuck pathfilenamebuf swap move
+\          2dup + >r pathfilenamebuf + swap move
+\          pathfilenamebuf r> true
+\   ELSE   false
+\   THEN ;
+
 : open-path-file ( c-addr1 u1 -- file-id c-addr2 u2 )
-    \ opens a file for reading, searching in the path for it; c-addr2
-    \ u2 is the full filename (valid until the next call); if the file
-    \ is not found (or in case of other errors for each try), -38
-    \ (non-existant file) is thrown. Opening for other access modes
-    \ makes little sense, as the path will usually contain dirs that
-    \ are only readable for the user
-    \ !! check for "/", "./", "../" in original filename; check for "~/"?
+    \ opens a file for reading, searching in the path for it (unless
+    \ the filename contains a slash); c-addr2 u2 is the full filename
+    \ (valid until the next call); if the file is not found (or in
+    \ case of other errors for each try), -38 (non-existant file) is
+    \ thrown. Opening for other access modes makes little sense, as
+    \ the path will usually contain dirs that are only readable for
+    \ the user
+    \ !! use file-status to determine access mode?
+    2dup [char] / scan nip ( 0<> )
+    if \ the filename contains a slash
+	2dup r/o open-file throw ( c-addr1 u1 file-id )
+	-rot >r pathfilenamebuf r@ cmove ( file-id R: u1 )
+	pathfilenamebuf r> EXIT
+    then
     pathdirs 2@ 0
+\    check-file-prefix 0= 
+\    IF  pathdirs 2@ 0
     ?DO ( c-addr1 u1 dirnamep )
 	dup >r 2@ dup >r pathfilenamebuf swap cmove ( addr u )
 	2dup pathfilenamebuf r@ chars + swap cmove ( addr u )
 	pathfilenamebuf over r> + dup >r r/o open-file 0=
-	if ( addr u file-id )
-	    nip nip r> rdrop 0 leave
-	then
+	IF ( addr u file-id )
+	    nip nip r> rdrop 0 LEAVE
+	THEN
 	rdrop drop r> cell+ cell+
     LOOP
+\    ELSE   2dup open-file throw -rot  THEN 
     0<> -&38 and throw ( file-id u2 )
     pathfilenamebuf swap ;
 
@@ -1507,7 +1530,7 @@ Defer 'cold ' noop IS 'cold
 	THEN
     THEN
     cr
-    ." GNU Forth 0.0alpha, Copyright (C) 1994 Free Software Foundation, Inc." cr
+    ." GNU Forth " version-string type ." , Copyright (C) 1994 Free Software Foundation, Inc." cr
     ." GNU Forth comes with ABSOLUTELY NO WARRANTY; for details type `license'" cr
     ." Type `bye' to exit"
     loadline off quit ;