X-Git-Url: https://git.distorted.org.uk/~mdw/lisp/blobdiff_plain/4da88bb98b75edf5033fa864cae0d3d1c397ac07..813da880d2d77f04ea623f426d543d298528f967:/sys-base.lisp

diff --git a/sys-base.lisp b/sys-base.lisp
index bef7ce9..e370fde 100644
--- a/sys-base.lisp
+++ b/sys-base.lisp
@@ -1,7 +1,5 @@
 ;;; -*-lisp-*-
 ;;;
-;;; $Id$
-;;;
 ;;; Basic system-specific stuff
 ;;;
 ;;; (c) 2005 Mark Wooding
@@ -40,23 +38,34 @@
 
 (defun set-command-line-arguments ()
   (setf *command-line*
-	(or (when (member :cl-launch *features*)
-	      (let* ((cll-package (find-package :cl-launch))
-		     (name (funcall (intern "GETENV" cll-package)
-				    "CL_LAUNCH_FILE"))
-		     (args (symbol-value (intern "*ARGUMENTS*"
-						 cll-package))))
-		(if name
-		    (cons name args)
-		    args)))
-	    #+cmu ext:*command-line-strings*
-	    #+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)
-			  collect (aref argv i))
-	    '("<unknown-lisp>" "--" "<unknown-script>")))
-  (setf *program-name* (pathname-name (car *command-line*))))
+	(let ((uiop-package (find-package :uiop))
+	      (cll-package (find-package :cl-launch)))
+	  (cons (or (and uiop-package
+			 (funcall (intern "ARGV0" uiop-package)))
+		    (and cll-package
+			 (some (intern "GETENV" cll-package)
+			       (list "__CL_ARGV0" "CL_LAUNCH_FILE")))
+		    #+sbcl (car sb-ext:*posix-argv*)
+		    #+cmu (car ext:*command-line-strings*)
+		    #+clisp (aref (ext:argv) 0)
+		    #+ecl (ext:argv 0)
+		    "<unknown-script>")
+		(cond (uiop-package
+		       (funcall (intern "COMMAND-LINE-ARGUMENTS"
+					uiop-package)))
+		      (cll-package
+		       (symbol-value (intern "*ARGUMENTS*" cll-package)))
+		      (t #.(or (car '(#+sbcl (cdr sb-ext:*posix-argv*)
+				      #+cmu (cdr ext:*command-line-strings*)
+				      #+clisp (coerce (subseq (ext:argv) 8)
+					       'list)
+				      #+ecl (loop for i from 1
+						  below (ext:argc)
+						  collect (ext:argv i))))
+			       (error "Unsupported Lisp."))))))
+
+	*program-name* (pathname-name (car *command-line*))))
+
 (set-command-line-arguments)
 
 #-clisp
@@ -64,7 +73,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 +85,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 --------------------------------------------------