X-Git-Url: https://git.distorted.org.uk/~mdw/lisp/blobdiff_plain/340560aa6113fde0aa8a3bb94bcdbb32860f5eea..d0754e55e97e5ae7c47a667a8580ca021174918d:/sys-base.lisp

diff --git a/sys-base.lisp b/sys-base.lisp
index fadbb87..b852eb3 100644
--- a/sys-base.lisp
+++ b/sys-base.lisp
@@ -31,7 +31,7 @@
 (defpackage #:mdw.sys-base
   (:use #:common-lisp #:runlisp)
   (:export #:exit #:hard-exit #:*program-name* #:*command-line*
-	   set-command-line-arguments)
+	   #:set-command-line-arguments)
   (:import-from #:runlisp #:*raw-command-line* #:*command-line* #:exit))
 (in-package #:mdw.sys-base)
 
@@ -41,16 +41,23 @@
 
 (defun set-command-line-arguments ()
   (setf *raw-command-line*
-	(or #+cl-launch cl-launch:*arguments*
+	(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 (coerce (ext:argv) 'list)
 	    '("<unknown-lisp>" "--" "<unknown-script>")))
   (setf *command-line*
-	(or #+cl-launch (cons (or (cl-launch:getenv "CL_LAUNCH_FILE")
-				  "<unknown-script>")
-			      cl-launch:*arguments*)
+	(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*))))