sys-base.lisp: Support for newer `uiop'-based `cl-launch'.

[lisp] / sys-base.lisp

diff --git a/sys-base.lisp b/sys-base.lisp
index 904c16518db7c8ac1d7623ac9af5a9a7f54ee1a4..60bc8a405a5e22e0437d912b091420a322ff9b92 100644 (file)
--- a/sys-base.lisp
+++ b/sys-base.lisp
@@ -25,41 +25,42 @@
 
 (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 *raw-command-line*)
 (defvar *command-line*)
 (defvar *program-name*)
 
 (defun set-command-line-arguments ()
-  (setf *raw-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))))
+  (setf *command-line*
+       (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)))
            #+cmu ext:*command-line-strings*
            #+sbcl sb-ext:*posix-argv*
            #+ecl (loop from i below (ext:argc) collect (ext:argv i))
-           #+clisp (coerce (ext:argv) 'list)
+           #+clisp (loop with argv = (ext:argv)
+                         for i from 7 below (length argv)
+                         collect (aref argv i))
            '("<unknown-lisp>" "--" "<unknown-script>")))
-  (setf *command-line*
-       (or (when (member :cl-launched *features*)
-             *raw-command-line*)
-           (cdr (member "--" *raw-command-line* :test #'string=))
-           *raw-command-line*))
   (setf *program-name* (pathname-name (car *command-line*))))
 (set-command-line-arguments)
 
@@ -68,7 +69,7 @@ (unless (fboundp 'exit)
   (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)
@@ -80,7 +81,7 @@ (defun hard-exit (&optional (code 0))
    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 --------------------------------------------------