X-Git-Url: https://git.distorted.org.uk/~mdw/lisp/blobdiff_plain/84f4b59f93535e938e21a083e05a49a1f20f9c26..0eed4749891adf0a7be89e786b8968ee805a8d41:/sys-base.lisp

diff --git a/sys-base.lisp b/sys-base.lisp
index b1e3595..bef7ce9 100644
--- a/sys-base.lisp
+++ b/sys-base.lisp
@@ -13,58 +13,70 @@
 ;;; it under the terms of the GNU General Public License as published by
 ;;; the Free Software Foundation; either version 2 of the License, or
 ;;; (at your option) any later version.
-;;; 
+;;;
 ;;; This program is distributed in the hope that it will be useful,
 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;;; GNU General Public License for more details.
-;;; 
+;;;
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with this program; if not, write to the Free Software Foundation,
 ;;; Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-(defpackage #:mdw.runlisp
-  (:use #:common-lisp #+cmu #:extensions)
-  (:export #:*lisp-interpreter* #:*command-line-strings*))
-(in-package #:mdw.runlisp)
-
-#+clisp
-(progn
-  (defvar *lisp-interpreter*)
-  (defvar *command-line-strings*)
-  (let ((args (coerce (ext:argv) 'list)))
-    (setf *lisp-interpreter* (car args))
-    (setf *command-line-strings* (nthcdr 7 args))))
+(defpackage #:runlisp
+  (:use #:common-lisp)
+  (:export #:*command-line* #:exit)
+  #+clisp (:import-from #:ext #:exit))
 
 (defpackage #:mdw.sys-base
-  (:use #:common-lisp #+cmu #:extensions #+cmu #:mdw.runlisp)
-  (:export #:exit #:hard-exit #:*program-name* #:*command-line-strings*)
-  (:import-from #:mdw.runlisp #:*lisp-interpreter* #:*command-line-strings*)
-  #+clisp (:import-from #:ext #:exit))
+  (:use #:common-lisp #:runlisp)
+  (:export #:exit #:hard-exit #:*program-name* #:*command-line*
+	   #:set-command-line-arguments)
+  (:import-from #:runlisp #:*command-line* #:exit))
 (in-package #:mdw.sys-base)
 
-;;; --- This is currently all a bit CMUCL-specific ---
+(defvar *command-line*)
+(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))))
+		(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)
 
-#+(or cmu)
-(defun exit (&optional (code 0))
-  "Polite way to end a program.  If running in an interactive Lisp, just
-   return to the top-level REPL."
-  (if #+cmu *batch-mode*
-      #+cmu (throw 'lisp::%end-of-the-world code)
-      (progn
-        (unless (zerop code)
-          (format t "~&Exiting unsuccessfully with code ~D.~%" code))
-        (abort))))
+#-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)
+    #-(or cmu ecl sbcl)
+    (progn
+      (unless (zerop code)
+	(format t "~&Exiting unsuccessfully with code ~D.~%" code))
+      (abort))))
 
 (defun hard-exit (&optional (code 0))
   "Stops the program immediately in its tracks.  Does nothing else.  Use
    after fork, for example, to avoid flushing buffers."
   (declare (type (unsigned-byte 32) code))
   #+cmu (unix::void-syscall ("_exit" c-call:int) code)
-  #+clisp (ext:quit code))
-
-(defvar *program-name*
-  (pathname-name (car *command-line-strings*))
-  "A plausible guess at the program's name, stripped of strange extensions.")
+  #+sbcl (sb-ext:quit :unix-status code :recklessly-p t)
+  #+(or clisp ecl) (ext:quit code))
 
 ;;;----- That's all, folks --------------------------------------------------