X-Git-Url: https://git.distorted.org.uk/~mdw/zone/blobdiff_plain/800554956d25b239b4a4892cf058d8a13ec54966..5fbfaf497e92e9afb794768f0ed58790eaca545b:/frontend.lisp

diff --git a/frontend.lisp b/frontend.lisp
index 11758c4..5241be0 100644
--- a/frontend.lisp
+++ b/frontend.lisp
@@ -13,78 +13,47 @@
 ;;; 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 #:zone.frontend
-  (:use #:common-lisp #:optparse #:zone)
+  (:use #:common-lisp #:optparse #:net #:zone)
   (:export #:main))
 (in-package #:zone.frontend)
 
-(defconstant version "1.0.0")
-
 (defvar opt-zones nil
   "Which zones to be emitted.")
 
-(defvar options nil)
-(defvar usage nil)
-(defun help (arg)
-  (declare (ignore arg))
-  (show-help *program-name* version usage options)
-  (exit 0))
-(defun version (arg)
-  (declare (ignore arg))
-  (format t "~A, version ~A~%" *program-name* version)
-  (exit 0))
-(defun do-usage (&optional (stream *standard-output*))
-  (show-usage *program-name* usage stream))
-(defun usage (arg)
-  (declare (ignore arg))
-  (do-usage)
-  (exit 0))
-(setf options
-      (options
-       "Help options"
-       (#\h "help" #'help
-	    "Show this help message.")
-       (#\v "version" #'version
-	    ("Show the `~A' program's version number." *program-name*))
-       (#\u "usage" #'usage
-	    ("Show a very brief usage summary for `~A'." *program-name*))
-
-       "Output options"
-       (#\z "zone" (:arg "NAME") (list opt-zones)
-	    "Write information about zone NAME.")))
-(setf usage (simple-usage options "ZONEDEF..."))
+(define-program
+    :version "1.0.0" :usage "ZONEDEF..."
+    :help "Generates BIND zone files from Lisp descriptions."
+    :options (options help-options
+		      "Output options"
+		      (#\z "zone" (:arg "NAME") (list opt-zones)
+			   "Write information about zone NAME.")))
 
 (defun main ()
   (with-unix-error-reporting ()
-    (let ((seq 54)
-	  (files nil)
-	  (op (make-option-parser (cdr *command-line-strings*) options)))
+    (let ((files nil))
       (unless (option-parse-try
-		(loop
-		   (multiple-value-bind (opt arg) (option-parse-next op)
-		     (declare (ignore arg))
-		     (unless opt
-		       (return))))
-		(setf files (option-parse-remainder op))
-		(when (zerop (length files))
-		  (option-parse-error "no files to read")))
-	(do-usage *error-output*)
-	(exit 1))
+		(do-options ()
+		  (nil (rest)
+		    (when (zerop (length rest))
+		      (option-parse-error "no files to read"))
+		    (setf files rest))))
+	(die-usage))
       (dolist (f files)
-	(let ((*package* (make-package (format nil "zone.scratch-~A"
-					       (incf seq))
-				       :use '(#:common-lisp #:zone))))
-	  (load f :verbose nil :print nil :if-does-not-exist :error)))
+	(let ((*package* (make-package "ZONE.SCRATCH"
+				       :use '(#:common-lisp #:net #:zone))))
+	  (load f :verbose nil :print nil :if-does-not-exist :error)
+	  (delete-package *package*)))
       (zone-save opt-zones))))
 
 ;;;----- That's all, folks --------------------------------------------------