X-Git-Url: https://git.distorted.org.uk/~mdw/lisp/blobdiff_plain/b2c12b4eaf6e5c43791d95080a243c35f97ee488..813da880d2d77f04ea623f426d543d298528f967:/sys-base.lisp

diff --git a/sys-base.lisp b/sys-base.lisp
index ef71916..e370fde 100644
--- a/sys-base.lisp
+++ b/sys-base.lisp
@@ -1,7 +1,5 @@
 ;;; -*-lisp-*-
 ;;;
-;;; $Id$
-;;;
 ;;; Basic system-specific stuff
 ;;;
 ;;; (c) 2005 Mark Wooding
@@ -25,36 +23,69 @@
 
 (defpackage #:runlisp
   (:use #:common-lisp)
-  (:export #:*lisp-interpreter* #:*command-line-strings* #:run))
-(defvar runlisp:*command-line-strings* '("<interactive>"))
+  (: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-strings*)
-  (:import-from #:runlisp #:*lisp-interpreter* #:*command-line-strings*)
-  #+clisp (:import-from #:ext #: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 *command-line*)
+(defvar *program-name*)
+
+(defun set-command-line-arguments ()
+  (setf *command-line*
+	(let ((uiop-package (find-package :uiop))
+	      (cll-package (find-package :cl-launch)))
+	  (cons (or (and uiop-package
+			 (funcall (intern "ARGV0" uiop-package)))
+		    (and cll-package
+			 (some (intern "GETENV" cll-package)
+			       (list "__CL_ARGV0" "CL_LAUNCH_FILE")))
+		    #+sbcl (car sb-ext:*posix-argv*)
+		    #+cmu (car ext:*command-line-strings*)
+		    #+clisp (aref (ext:argv) 0)
+		    #+ecl (ext:argv 0)
+		    "<unknown-script>")
+		(cond (uiop-package
+		       (funcall (intern "COMMAND-LINE-ARGUMENTS"
+					uiop-package)))
+		      (cll-package
+		       (symbol-value (intern "*ARGUMENTS*" cll-package)))
+		      (t #.(or (car '(#+sbcl (cdr sb-ext:*posix-argv*)
+				      #+cmu (cdr ext:*command-line-strings*)
+				      #+clisp (coerce (subseq (ext:argv) 8)
+					       'list)
+				      #+ecl (loop for i from 1
+						  below (ext:argc)
+						  collect (ext:argv i))))
+			       (error "Unsupported Lisp."))))))
+
+	*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:exit :code 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)
+  #+sbcl (sb-ext:exit :code code :abort t)
   #+(or clisp ecl) (ext:quit code))
 
-#-clisp
-(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 (boundp '*lisp-interpreter*)
-      #+(or cmu ecl) (ext:quit code)
-      (progn
-        (unless (zerop code)
-          (format t "~&Exiting unsuccessfully with code ~D.~%" code))
-        (abort))))
-
-(defvar *program-name*
-  (pathname-name (car *command-line-strings*))
-  "A plausible guess at the program's name, stripped of strange extensions.")
-
 ;;;----- That's all, folks --------------------------------------------------