X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/lisp/blobdiff_plain/1cbc65e7d3d318b21fa3793676ad203a799e2206..48232c30457dba5a27e8d9ee6b49d18e224568e5:/sys-base.lisp

diff --git a/sys-base.lisp b/sys-base.lisp
index bb1cd45..904c165 100644
--- a/sys-base.lisp
+++ b/sys-base.lisp
@@ -42,11 +42,14 @@ (defvar *program-name*)
 (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)))))
+	      (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))