mdw-base.lisp: Export `case2' correctly.

[lisp] / sys-base.lisp

diff --git a/sys-base.lisp b/sys-base.lisp
index 7e450a221f28cb0cc8eb6dc024ed9c310e883097..4a90b9374d88cd1bb759203e6b41ecab107cabb5 100644 (file)
--- a/sys-base.lisp
+++ b/sys-base.lisp
@@ -1,7 +1,5 @@
 ;;; -*-lisp-*-
 ;;;
-;;; $Id$
-;;;
 ;;; Basic system-specific stuff
 ;;;
 ;;; (c) 2005 Mark Wooding
@@ -41,11 +39,16 @@ (defvar *program-name*)
 (defun set-command-line-arguments ()
   (setf *command-line*
        (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))))
+             (let* ((uiop-package (find-package :uiop))
+                    (cll-package (find-package :cl-launch))
+                    (name (some (intern "GETENV"
+                                        (or uiop-package cll-package))
+                                (list "__CL_ARGV0" "CL_LAUNCH_FILE")))
+                    (args (symbol-value
+                           (if uiop-package
+                               (intern "*COMMAND-LINE-ARGUMENTS*"
+                                       uiop-package)
+                               (intern "*ARGUMENTS*" cll-package)))))
                (if name
                    (cons name args)
                    args)))
@@ -53,7 +56,7 @@ (defun set-command-line-arguments ()
            #+sbcl sb-ext:*posix-argv*
            #+ecl (loop from i below (ext:argc) collect (ext:argv i))
            #+clisp (loop with argv = (ext:argv)
-                         for i from 7 below (length argv)
+                         for i from 7 below (length argv)
                          collect (aref argv i))
            '("<unknown-lisp>" "--" "<unknown-script>")))
   (setf *program-name* (pathname-name (car *command-line*))))