Merge branch 'master' of metalzone.distorted.org.uk:~mdw/public-git/lisp

[lisp] / sys-base.lisp

diff --git a/sys-base.lisp b/sys-base.lisp
index b852eb3..370e80e 100644 (file)
--- a/sys-base.lisp
+++ b/sys-base.lisp
@@ -25,22 +25,21 @@
 
 (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))
+  (: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*
+  (setf *command-line*
        (or (when (member :cl-launch *features*)
              (let* ((cll-package (find-package :cl-launch))
                     (name (funcall (intern "GETENV" cll-package)
@@ -53,13 +52,10 @@
            #+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)