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

diff --git a/sys-base.lisp b/sys-base.lisp
index bb1cd45..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,12 +41,15 @@
 
 (defun set-command-line-arguments ()
   (setf *raw-command-line*
-	(or (when (member :cl-launched *features*)
-	      (cons (or (funcall (intern "GETENV" (find-package :cl-launch))
-				 "CL_LAUNCH_FILE")
-			"<unknown-script>")
-		    (symbol-value (intern "*ARGUMENTS*"
-					  (find-package :cl-launch)))))
+	(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))