Lots of tidying up.

[lisp] / sys-base.lisp

diff --git a/sys-base.lisp b/sys-base.lisp
index 359da3f..4f52ec8 100644 (file)
--- a/sys-base.lisp
+++ b/sys-base.lisp
@@ -1,7 +1,5 @@
 ;;; -*-lisp-*-
 ;;;
-;;; $Id$
-;;;
 ;;; Basic system-specific stuff
 ;;;
 ;;; (c) 2005 Mark Wooding
@@ -25,31 +23,46 @@
 
 (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*)
-  (:import-from #:runlisp #:*raw-command-line* #:*command-line* #:exit))
+  (:export #:exit #:hard-exit #:*program-name* #:*command-line*
+          #:set-command-line-arguments)
+  (:import-from #:runlisp #:*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 *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 *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))))
+               (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))
+           #+clisp (loop with argv = (ext:argv)
+                         for i from 7 below (length argv)
+                         collect (aref argv i))
+           '("<unknown-lisp>" "--" "<unknown-script>")))
+  (setf *program-name* (pathname-name (car *command-line*))))
+(set-command-line-arguments)
 
 #-clisp
 (unless (fboundp 'exit)
   (defun exit (&optional (code 0))
     "Polite way to end a program."
     #+(or cmu ecl) (ext:quit code)
-    #+sbcl (sb-ext:quit :unix-status code)
+    #+sbcl (sb-ext:exit :code code)
     #-(or cmu ecl sbcl)
     (progn
       (unless (zerop code)
@@ -61,11 +74,7 @@
    after fork, for example, to avoid flushing buffers."
   (declare (type (unsigned-byte 32) code))
   #+cmu (unix::void-syscall ("_exit" c-call:int) code)
-  #+sbcl (sb-ext:quit :unix-status code :recklessly-p t)
+  #+sbcl (sb-ext:exit :code code :abort 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 --------------------------------------------------