X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fbsd-os.lisp;h=5567c3f7ae7577d21649b71d4445743c36e5b8c3;hb=4ae1b794a5d6a90794468cf8017f5307f2c30dfe;hp=22edc57d8c430da7b8b136bb959ef1515757c98e;hpb=dccfa0f4e378a267744c03b1416accdf9d888987;p=sbcl.git

diff --git a/src/code/bsd-os.lisp b/src/code/bsd-os.lisp
index 22edc57..5567c3f 100644
--- a/src/code/bsd-os.lisp
+++ b/src/code/bsd-os.lisp
@@ -34,7 +34,12 @@
 (defun os-cold-init-or-reinit ()
   (setf *software-version* nil)
   (setf *default-pathname-defaults*
-	(pathname (sb!ext::default-directory))))
+	;; (temporary value, so that #'PATHNAME won't blow up when
+	;; we call it below:)
+	(make-trivial-default-pathname)
+	*default-pathname-defaults*
+	;; (final value, constructed using #'PATHNAME:)
+	(pathname (sb!unix:posix-getcwd/))))
 
 ;;; Return system time, user time and number of page faults.
 (defun get-system-info ()
@@ -43,7 +48,7 @@
 		       (sb!unix:unix-getrusage sb!unix:rusage_self)
     (declare (ignore maxrss ixrss idrss isrss minflt))
     (unless err?
-      (simple-perror "Unix system call getrusage failed" :errno utime))
+      (simple-perror "Unix system call getrusage() failed" :errno utime))
     
     (values utime stime majflt)))