X-Git-Url: https://git.distorted.org.uk/~mdw/lisp/blobdiff_plain/beaffa5a28a7826b459c0efe2609c6feedea1067..fe0f07ea19b36ce1abc1ec305d0203323cbf2316:/sys-base.lisp

diff --git a/sys-base.lisp b/sys-base.lisp
index 440facf..83f06f2 100644
--- a/sys-base.lisp
+++ b/sys-base.lisp
@@ -23,36 +23,38 @@
 ;;; 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*))
+(defpackage #:runlisp
+  (:use #:common-lisp)
+  (:export #:*lisp-interpreter* #:*command-line-strings* #:run))
+(defvar runlisp:*command-line-strings* '("<interactive>"))
+
 (defpackage #:mdw.sys-base
-  (:use #:common-lisp #+cmu #:extensions #:mdw.runlisp)
-  (:export #:exit #:hard-exit #:*program-name* #:*command-line-strings*))
+  (: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))
 (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))
 
-#+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 *batch-mode*
-      (throw 'lisp::%end-of-the-world code)
+  (if (boundp '*lisp-interpreter*)
+      #+(or cmu ecl) (ext:quit code)
       (progn
         (unless (zerop code)
           (format t "~&Exiting unsuccessfully with code ~D.~%" code))
         (abort))))
 
-#+cmu
-(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))
-  (unix::void-syscall ("_exit" c-call:int) code))
-
-#+cmu
-(defvar *program-name* (pathname-name (car *command-line-strings*))
+(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 --------------------------------------------------