[Sbcl-commits] CVS: sbcl/src/code toplevel.lisp, 1.86, 1.87 filesys.lisp, 1.59, 1.60

[Juho S. <js...@us...>]

Update of /cvsroot/sbcl/sbcl/src/code
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv14288/src/code

Modified Files:
	toplevel.lisp filesys.lisp 
Log Message:
0.9.14.22:
	Check whether SBCL_HOME has been set before trying to use it
        in sbcl-homedir-pathname, since it might not have a value
        when using :EXECUTABLE T cores. (Regression between 0.9.13 and
        0.9.14, reported by James Knight).


Index: toplevel.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/toplevel.lisp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- toplevel.lisp	20 Jun 2006 06:45:45 -0000	1.86
+++ toplevel.lisp	17 Jul 2006 19:39:45 -0000	1.87
@@ -484,8 +484,9 @@
                             default-init-file-names))))
         (let ((sysinit-truename
                (probe-init-files sysinit
-                                 (merge-pathnames (sbcl-homedir-pathname)
-                                                  "sbclrc")
+                                 (let ((sbcl-homedir (sbcl-homedir-pathname)))
+                                   (when sbcl-homedir
+                                     (merge-pathnames sbcl-homedir "sbclrc")))
                                  #!-win32
                                  "/etc/sbclrc"
                                  #!+win32

Index: filesys.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/filesys.lisp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- filesys.lisp	20 Jun 2006 06:45:45 -0000	1.59
+++ filesys.lisp	17 Jul 2006 19:39:45 -0000	1.60
@@ -564,8 +564,11 @@
              (concatenate 'string string "/"))))
 
 (defun sbcl-homedir-pathname ()
-  (parse-native-namestring
-   (ensure-trailing-slash (posix-getenv "SBCL_HOME"))))
+  (let ((sbcl-home (posix-getenv "SBCL_HOME")))
+    ;; SBCL_HOME isn't set for :EXECUTABLE T embedded cores
+    (when sbcl-home
+      (parse-native-namestring
+       (ensure-trailing-slash sbcl-home)))))
 
 ;;; (This is an ANSI Common Lisp function.)
 (defun user-homedir-pathname (&optional host)