X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fbsd-os.lisp;h=97814f2cc8c742958d5ee0ccbb0c1775e6923b0d;hb=2561033fd3ed9e224dffc445262e097e5abfa920;hp=8e30939c61a042a6b2255dd616429470e40460d3;hpb=72408d179d7396904e25e9a3dc423d2634e65072;p=sbcl.git

diff --git a/src/code/bsd-os.lisp b/src/code/bsd-os.lisp
index 8e30939..97814f2 100644
--- a/src/code/bsd-os.lisp
+++ b/src/code/bsd-os.lisp
@@ -1,4 +1,4 @@
-;;;; OS interface functions for CMU CL under BSD Unix.
+;;;; OS interface functions for SBCL under BSD Unix.
 
 ;;;; This code was written as part of the CMU Common Lisp project at
 ;;;; Carnegie Mellon University, and has been placed in the public
@@ -8,17 +8,18 @@
 
 ;;;; Check that target machine features are set up consistently with
 ;;;; this file.
-#!-bsd (eval-when (:compile-toplevel :load-toplevel :execute)
-	 (error "The :BSD feature is missing, we shouldn't be doing this code."))
+#!-bsd
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (error "The :BSD feature is missing, we shouldn't be doing this code."))
 
 (defun software-type ()
   #!+sb-doc
   "Return a string describing the supporting software."
   (the string ; (to force error in case of unsupported BSD variant)
        #!+FreeBSD "FreeBSD"
-       #!+OpenBSD "OpenBSD"))
-
-(defvar *software-version* nil)
+       #!+OpenBSD "OpenBSD"
+       #!+NetBSD "NetBSD"
+       #!+Darwin "Darwin"))
 
 (defun software-version ()
   #!+sb-doc
@@ -26,27 +27,20 @@
    if not available."
   (or *software-version*
       (setf *software-version*
-	    (string-trim '(#\newline)
-			 (with-output-to-string (stream)
-			   (sb!ext:run-program "/usr/bin/uname" `("-r")
-					       :output stream))))))
+            (string-trim '(#\newline)
+                         (with-output-to-string (stream)
+                           (sb!ext:run-program "/usr/bin/uname" `("-r")
+                                               :output stream))))))
 
-;;; OS-COLD-INIT-OR-REINIT initializes our operating-system interface.
-;;; It sets the values of the global port variables to what they
-;;; should be and calls the functions that set up the argument blocks
-;;; for the server interfaces.
-(defun os-cold-init-or-reinit ()
-  (setf *software-version* nil))
-
 ;;; Return system time, user time and number of page faults.
 (defun get-system-info ()
   (multiple-value-bind (err? utime stime maxrss ixrss idrss
-			     isrss minflt majflt)
-		       (sb!unix:unix-getrusage sb!unix:rusage_self)
+                             isrss minflt majflt)
+                       (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)))
 
 ;;; Return the system page size.