frontend.lisp: Whitespace fixing.

[zone] / frontend.lisp

diff --git a/frontend.lisp b/frontend.lisp
index ef9c090..9d62d29 100644 (file)
--- 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 #: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,6 +75,20 @@
                      (#\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.")))
 
@@ -72,6 +107,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 --------------------------------------------------