X-Git-Url: https://git.distorted.org.uk/~mdw/fringe/blobdiff_plain/2bd37ef118cb1e41cb0e9e2332a9eb69ac2f2df4..4eee07acff4f1da272dd47765a6d12d47d0bf51a:/cl-fringe.lisp

diff --git a/cl-fringe.lisp b/cl-fringe.lisp
index 0081ee3..3716f3b 100644
--- a/cl-fringe.lisp
+++ b/cl-fringe.lisp
@@ -95,16 +95,21 @@
 				       (iterate-fringe (parse-tree b))))))))
 
 #+cl-launch
-(flet ((bail (format args)
-	 (format *error-output* "~A: ~?~%"
-		 (cl-launch:getenv "CL_LAUNCH_FILE") format args)
-	 (cl-launch:quit 1)))
-  (handler-case
-      (main cl-launch:*arguments*)
-    (simple-error (err)
-      (bail (simple-condition-format-control err)
-	    (simple-condition-format-arguments err)))
-    (error (err)
-      (bail "~A" err))))
+(progn
+  (defparameter *program-name*
+    (pathname-name (or (cl-launch:getenv "CL_LAUNCH_FILE")
+		       (namestring *load-pathname*)
+		       "<unknown>")))
+  (defun launch ()
+    (flet ((bail (format args)
+	     (format *error-output* "~A: ~?~%" *program-name* format args)
+	     (cl-launch:quit 1)))
+      (handler-case
+	  (main cl-launch:*arguments*)
+	(simple-error (err)
+	  (bail (simple-condition-format-control err)
+		(simple-condition-format-arguments err)))
+	(error (err)
+	  (bail "~A" err))))))
 
 ;;;----- That's all, folks --------------------------------------------------