0.8.9.6.netbsd.2:

[sbcl.git] / src / code / bsd-os.lisp

diff --git a/src/code/bsd-os.lisp b/src/code/bsd-os.lisp
index 22edc57..6a96ee9 100644 (file)
--- a/src/code/bsd-os.lisp
+++ b/src/code/bsd-os.lisp
@@ -16,7 +16,9 @@
   "Return a string describing the supporting software."
   (the string ; (to force error in case of unsupported BSD variant)
        #!+FreeBSD "FreeBSD"
-       #!+OpenBSD "OpenBSD"))
+       #!+OpenBSD "OpenBSD"
+       #!+NetBSD "NetBSD"
+       #!+Darwin "Darwin"))
 
 (defvar *software-version* nil)
 
@@ -34,7 +36,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 +50,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)))