Change `system-library-pathname' so that it signals an error if it
authorChris Hanson <org/chris-hanson/cph>
Thu, 15 Nov 1990 23:45:39 +0000 (23:45 +0000)
committerChris Hanson <org/chris-hanson/cph>
Thu, 15 Nov 1990 23:45:39 +0000 (23:45 +0000)
can't find the file.

v7/src/runtime/pathnm.scm
v7/src/runtime/savres.scm

index 0dd2dba98d6cc8485b57b9b515614faeab1e8e82..bb5e6d77d7160b3fd5957864e2bb6f55a567a7b6 100644 (file)
@@ -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)
index c71cdb06806ceb671e3fe9bd065f8552eeb7e697..f9cec06e1d22d8181fbf4acb39c4df4c1b2fad26 100644 (file)
@@ -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)))