From 003ebbaa2cf2a7bb71c65c35a8703b38508dea8d Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Mon, 9 Feb 2009 00:02:08 +0000 Subject: [PATCH] sys-base: Fix collection of command-line options for CLisp. I don't like runlisp any more, and looking for its `--' marker is just unsound. Also zap *RAW-COMMAND-LINE* because it just isn't a very useful thing to have around. --- sys-base.lisp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sys-base.lisp b/sys-base.lisp index 904c165..a8e23df 100644 --- a/sys-base.lisp +++ b/sys-base.lisp @@ -35,12 +35,11 @@ (:import-from #:runlisp #:*raw-command-line* #:*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-launched *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)) '("" "--" ""))) - (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) -- 2.11.0