X-Git-Url: https://git.distorted.org.uk/~mdw/lisp/blobdiff_plain/003ebbaa2cf2a7bb71c65c35a8703b38508dea8d..209dc75acf6ca1b236324bbad404070a88f99851:/sys-base.lisp

diff --git a/sys-base.lisp b/sys-base.lisp
index a8e23df..4a90b93 100644
--- a/sys-base.lisp
+++ b/sys-base.lisp
@@ -1,7 +1,5 @@
 ;;; -*-lisp-*-
 ;;;
-;;; $Id$
-;;;
 ;;; Basic system-specific stuff
 ;;;
 ;;; (c) 2005 Mark Wooding
@@ -25,14 +23,14 @@
 
 (defpackage #:runlisp
   (:use #:common-lisp)
-  (:export #:*raw-command-line* #:*command-line* #:exit)
+  (:export #:*command-line* #:exit)
   #+clisp (:import-from #:ext #:exit))
 
 (defpackage #:mdw.sys-base
   (:use #:common-lisp #:runlisp)
   (:export #:exit #:hard-exit #:*program-name* #:*command-line*
-	   set-command-line-arguments)
-  (:import-from #:runlisp #:*raw-command-line* #:*command-line* #:exit))
+	   #:set-command-line-arguments)
+  (:import-from #:runlisp #:*command-line* #:exit))
 (in-package #:mdw.sys-base)
 
 (defvar *command-line*)
@@ -40,12 +38,17 @@
 
 (defun set-command-line-arguments ()
   (setf *command-line*
-	(or (when (member :cl-launched *features*)
-	      (let* ((cll-package (find-package :cl-launch))
-		     (name (funcall (intern "GETENV" cll-package)
-				    "CL_LAUNCH_FILE"))
-		     (args (symbol-value (intern "*ARGUMENTS*"
-						 cll-package))))
+	(or (when (member :cl-launch *features*)
+	      (let* ((uiop-package (find-package :uiop))
+		     (cll-package (find-package :cl-launch))
+		     (name (some (intern "GETENV"
+					 (or uiop-package cll-package))
+				 (list "__CL_ARGV0" "CL_LAUNCH_FILE")))
+		     (args (symbol-value
+			    (if uiop-package
+				(intern "*COMMAND-LINE-ARGUMENTS*"
+					uiop-package)
+				(intern "*ARGUMENTS*" cll-package)))))
 		(if name
 		    (cons name args)
 		    args)))
@@ -53,7 +56,7 @@
 	    #+sbcl sb-ext:*posix-argv*
 	    #+ecl (loop from i below (ext:argc) collect (ext:argv i))
 	    #+clisp (loop with argv = (ext:argv)
-		          for i from 7 below (length argv)
+			  for i from 7 below (length argv)
 			  collect (aref argv i))
 	    '("<unknown-lisp>" "--" "<unknown-script>")))
   (setf *program-name* (pathname-name (car *command-line*))))
@@ -64,7 +67,7 @@
   (defun exit (&optional (code 0))
     "Polite way to end a program."
     #+(or cmu ecl) (ext:quit code)
-    #+sbcl (sb-ext:quit :unix-status code)
+    #+sbcl (sb-ext:exit :code code)
     #-(or cmu ecl sbcl)
     (progn
       (unless (zerop code)
@@ -76,7 +79,7 @@
    after fork, for example, to avoid flushing buffers."
   (declare (type (unsigned-byte 32) code))
   #+cmu (unix::void-syscall ("_exit" c-call:int) code)
-  #+sbcl (sb-ext:quit :unix-status code :recklessly-p t)
+  #+sbcl (sb-ext:exit :code code :abort t)
   #+(or clisp ecl) (ext:quit code))
 
 ;;;----- That's all, folks --------------------------------------------------