X-Git-Url: https://git.distorted.org.uk/~mdw/zone/blobdiff_plain/122041a01dd0473d0fa603ba59c58bbe9d203fa1..1a339c77202274463e6150bea957ddf53b800815:/frontend.lisp

diff --git a/frontend.lisp b/frontend.lisp
index ef9c090..f957601 100644
--- a/frontend.lisp
+++ b/frontend.lisp
@@ -1,7 +1,5 @@
 ;;; -*-lisp-*-
 ;;;
-;;; $Id$
-;;;
 ;;; Zone generator frontend
 ;;;
 ;;; (c) 2005 Straylight/Edgeware
@@ -24,16 +22,39 @@
 ;;; Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 (defpackage #:zone.frontend
-  (:use #:common-lisp #:optparse #:net #:zone)
+  (:use #:common-lisp #:mdw.sys-base #:optparse #:net #:zone
+	#+cmu #:mop
+	#+sbcl #:sb-mop)
   (:export #:main))
 (in-package #:zone.frontend)
 
 (defvar opt-zones nil
   "Which zones to be emitted.")
+(defvar opt-format :bind
+  "Which format to use on output.")
+
+(defun directory-exists-p (name)
+
+  ;; Make a pathname for NAME which has the right form for a directory.
+  (let ((dirpath
+	 (let ((path (pathname name)))
+	   (if (null (pathname-name path))
+	       path
+	       (make-pathname :directory
+			      (append (or (pathname-directory path)
+					  (list :relative))
+				      (list (pathname-name path)))
+			      :name nil
+			      :type nil
+			      :defaults path)))))
+
+    ;; Now check that it exists.
+    #+clisp (and (ext:probe-directory dirpath) (truename dirpath))
+    #-clisp (probe-file dirpath)))
 
 (eval-when (:compile-toplevel :load-toplevel)
   (defopthandler dir (var arg) ()
-    (let ((path (probe-file arg)))
+    (let ((path (directory-exists-p arg)))
       (if (and path
 	       (not (pathname-name path)))
 	  (setf var path)
@@ -54,10 +75,25 @@
 		      (#\d "directory" (:arg "DIRECTORY")
 			   (dir *zone-output-path*)
 			   "Write zone and serial files to DIRECTORY.")
+		      (#\F "format" (:arg "FORMAT")
+			   (keyword opt-format
+				    (delete-duplicates
+				     (loop for method in
+					   (generic-function-methods
+					    #'zone:zone-write)
+					   for specs =
+					   (method-specializers method)
+					   if (typep (car specs)
+						     'eql-specializer)
+					   collect
+					   (eql-specializer-object
+					    (car specs)))))
+			   "Format to use for output.")
 		      (#\z "zone" (:arg "NAME") (list opt-zones)
 			   "Write information about zone NAME.")))
 
 (defun main ()
+  (set-command-line-arguments)
   (with-unix-error-reporting ()
     (let ((files nil))
       (unless (option-parse-try
@@ -72,6 +108,6 @@
 				       :use '(#:common-lisp #:net #:zone))))
 	  (load f :verbose nil :print nil :if-does-not-exist :error)
 	  (delete-package *package*)))
-      (zone-save opt-zones))))
+      (zone-save opt-zones :format opt-format))))
 
 ;;;----- That's all, folks --------------------------------------------------