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

diff --git a/sys-base.lisp b/sys-base.lisp
index b1e3595..ede099a 100644
--- a/sys-base.lisp
+++ b/sys-base.lisp
@@ -23,46 +23,35 @@
 ;;; 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 #:*lisp-interpreter* #:*command-line-strings* #:run))
 
 (defpackage #:mdw.sys-base
-  (:use #:common-lisp #+cmu #:extensions #+cmu #:mdw.runlisp)
+  (:use #:common-lisp #:runlisp)
   (:export #:exit #:hard-exit #:*program-name* #:*command-line-strings*)
-  (:import-from #:mdw.runlisp #:*lisp-interpreter* #:*command-line-strings*)
+  (:import-from #:runlisp #:*lisp-interpreter* #:*command-line-strings*)
   #+clisp (:import-from #:ext #:exit))
 (in-package #:mdw.sys-base)
 
-;;; --- This is currently all a bit CMUCL-specific ---
+(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)
+  #+(or clisp ecl) (ext:quit code))
 
-#+(or cmu)
+#-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 #+cmu *batch-mode*
-      #+cmu (throw 'lisp::%end-of-the-world code)
+  (if (boundp '*command-line-strings*)
+      #+(or cmu ecl) (ext:quit code)
       (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.")