From: Chris Hanson <org/chris-hanson/cph>
Date: Thu, 15 Nov 1990 23:45:39 +0000 (+0000)
Subject: Change `system-library-pathname' so that it signals an error if it
X-Git-Tag: 20090517-FFI~11039
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=3f3a325992eb7b693de6568c55786b8caf5ac7dd;p=mit-scheme.git

Change `system-library-pathname' so that it signals an error if it
can't find the file.
---

diff --git a/v7/src/runtime/pathnm.scm b/v7/src/runtime/pathnm.scm
index 0dd2dba98..bb5e6d77d 100644
--- a/v7/src/runtime/pathnm.scm
+++ b/v7/src/runtime/pathnm.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/pathnm.scm,v 14.9 1990/11/15 23:37:20 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/pathnm.scm,v 14.10 1990/11/15 23:45:39 cph Rel $
 
 Copyright (c) 1988, 1989, 1990 Massachusetts Institute of Technology
 
@@ -426,10 +426,10 @@ See the files unkpth.scm, vmspth.scm, or unxpth.scm for examples.|#
 
 (define (system-library-pathname pathname)
   (let loop ((directories library-directory-path))
-    (and (not (null? directories))
-	 (or (pathname->input-truename
-	      (merge-pathnames pathname (car directories)))
-	     (loop (cdr directories))))))
+    (if (null? directories)
+	(error error-type:open-file pathname))
+    (or (pathname->input-truename (merge-pathnames pathname (car directories)))
+	(loop (cdr directories)))))
 
 (define (system-library-directory-pathname pathname)
   (if (not pathname)
diff --git a/v7/src/runtime/savres.scm b/v7/src/runtime/savres.scm
index c71cdb068..f9cec06e1 100644
--- a/v7/src/runtime/savres.scm
+++ b/v7/src/runtime/savres.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/savres.scm,v 14.16 1990/11/15 23:27:44 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/savres.scm,v 14.17 1990/11/15 23:45:22 cph Rel $
 
 Copyright (c) 1988, 1989, 1990 Massachusetts Institute of Technology
 
@@ -148,11 +148,8 @@ MIT in each case. |#
 		   (error "no default band name available")))
 	      (let ((pathname
 		     (pathname-default-type (->pathname filename) "com")))
-		(let ((truename
-		       (or (pathname->input-truename pathname)
-			   (system-library-pathname pathname))))
-		  (if (not truename) (error error-type:open-file pathname))
-		  truename))))))
+		(or (pathname->input-truename pathname)
+		    (system-library-pathname pathname)))))))
     (event-distributor/invoke! event:before-exit)
     ((ucode-primitive load-band) filename)))