From 340560aa6113fde0aa8a3bb94bcdbb32860f5eea Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 3 Jun 2008 10:25:25 +0100
Subject: [PATCH] sys-base: Support for cl-launch.

runlisp is hereby deprecated.
---
 sys-base.lisp | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/sys-base.lisp b/sys-base.lisp
index 359da3f..fadbb87 100644
--- a/sys-base.lisp
+++ b/sys-base.lisp
@@ -27,22 +27,34 @@
   (:use #:common-lisp)
   (:export #:*raw-command-line* #:*command-line* #:exit)
   #+clisp (:import-from #:ext #:exit))
+
 (defpackage #:mdw.sys-base
   (:use #:common-lisp #:runlisp)
-  (:export #:exit #:hard-exit #:*program-name* #:*command-line*)
+  (:export #:exit #:hard-exit #:*program-name* #:*command-line*
+	   set-command-line-arguments)
   (:import-from #:runlisp #:*raw-command-line* #:*command-line* #:exit))
 (in-package #:mdw.sys-base)
 
-(defvar *raw-command-line*
-  (or #+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>")))
+(defvar *raw-command-line*)
+(defvar *command-line*)
+(defvar *program-name*)
 
-(defvar *command-line*
-  (or (cdr (member "--" *raw-command-line* :test #'string=))
-      *raw-command-line*))
+(defun set-command-line-arguments ()
+  (setf *raw-command-line*
+	(or #+cl-launch cl-launch:*arguments*
+	    #+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*)
+	    (cdr (member "--" *raw-command-line* :test #'string=))
+	    *raw-command-line*))
+  (setf *program-name* (pathname-name (car *command-line*))))
+(set-command-line-arguments)
 
 #-clisp
 (unless (fboundp 'exit)
@@ -64,8 +76,4 @@
   #+sbcl (sb-ext:quit :unix-status code :recklessly-p t)
   #+(or clisp ecl) (ext:quit code))
 
-(defvar *program-name*
-  (pathname-name (car *command-line*))
-  "A plausible guess at the program's name, stripped of strange extensions.")
-
 ;;;----- That's all, folks --------------------------------------------------
-- 
2.11.0