From: Arthur Gleckler <edu/mit/csail/zurich/arthur>
Date: Mon, 16 Oct 2006 06:23:45 +0000 (+0000)
Subject: Fixed bug: LOAD failed with relative pathnames, e.g.:
X-Git-Tag: 20090517-FFI~893
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=0eadd7b691cd22b543e094ff56eee940de940aa1;p=mit-scheme.git

Fixed bug: LOAD failed with relative pathnames, e.g.:

  (load "../foo.scm")
---

diff --git a/v7/src/runtime/load.scm b/v7/src/runtime/load.scm
index e61302ff6..154e26624 100644
--- a/v7/src/runtime/load.scm
+++ b/v7/src/runtime/load.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: load.scm,v 14.78 2006/10/02 04:18:01 cph Exp $
+$Id: load.scm,v 14.79 2006/10/16 06:23:45 savannah-arthur Exp $
 
 Copyright 1988,1989,1990,1991,1992,1993 Massachusetts Institute of Technology
 Copyright 1994,1999,2000,2001,2002,2003 Massachusetts Institute of Technology
@@ -240,10 +240,12 @@ USA.
 (define (try-built-in pathname)
   (let ((d (pathname-directory pathname)))
     (and (pair? d)
-	 ((ucode-primitive initialize-c-compiled-block 1)
-	  (string-append (last d)
-			 "_"
-			 (pathname-name pathname))))))
+	 (let ((tail (last d)))
+	   (and (string? tail)		;Doesn't handle UP ("..").
+		((ucode-primitive initialize-c-compiled-block 1)
+		 (string-append tail
+				"_"
+				(pathname-name pathname))))))))
 
 (define (load/internal pathname environment purify? load-noisily?)
   (let* ((port (open-input-file pathname))