X-Git-Url: https://git.distorted.org.uk/~mdw/zone/blobdiff_plain/7d593efdac74772541cd65e959a890a70ffd8e97..2ec279f5e3c55fb220c0d28b08107e3456da663a:/zone.lisp

diff --git a/zone.lisp b/zone.lisp
index 64488c2..5755d11 100644
--- a/zone.lisp
+++ b/zone.lisp
@@ -144,9 +144,18 @@
 ;;;--------------------------------------------------------------------------
 ;;; Zone defaults.  It is intended that scripts override these.
 
+#+ecl
+(cffi:defcfun gethostname :int
+  (name :pointer)
+  (len :uint))
+
 (defvar *default-zone-source*
   (let ((hn #+cmu (unix:unix-gethostname)
-	    #+clisp (unix:get-host-name)))
+	    #+clisp (unix:get-host-name)
+	    #+ecl (cffi:with-foreign-pointer-as-string (buffer 256 len)
+		    (let ((rc (gethostname buffer len)))
+		      (unless (zerop rc)
+			(error "gethostname(2) failed (rc = ~A)." rc))))))
     (and hn (concatenate 'string (canonify-hostname hn) ".")))
   "The default zone source: the current host's name.")
 
@@ -504,7 +513,7 @@
   (setf types (listify types))
   (let* ((type (car types))
 	 (func (intern (format nil "ZONE-PARSE/~:@(~A~)" type))))
-    (multiple-value-bind (doc decls body) (parse-body body)
+    (with-parsed-body (body decls doc) body
       (with-gensyms (col tname ttype tttl tdata tdefsubp i)
 	`(progn
 	   (dolist (,i ',types)