X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fdig.el;h=e1441fe6a7b1447c164dbd1f6288734e4923401f;hb=7212fdd8f9318b35adaf02164abb545205d6e2cf;hp=eb70722631a8f8a4685d4531f7685738344551f0;hpb=c1f555f59252386aa34030e54c50e2a7724afcd9;p=gnus

diff --git a/lisp/dig.el b/lisp/dig.el
index eb7072263..e1441fe6a 100644
--- a/lisp/dig.el
+++ b/lisp/dig.el
@@ -1,25 +1,24 @@
 ;;; dig.el --- Domain Name System dig interface
-;; Copyright (c) 2000 Free Software Foundation, Inc.
+
+;; Copyright (C) 2000-2014 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
-;; Keywords: DNS BIND dig
+;; Keywords: DNS BIND dig comm
 
-;; This file is not a part of GNU Emacs, but the same permissions apply.
+;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published
-;; by the Free Software Foundation; either version 2, or (at your
-;; option) any later version.
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
-;; GNU Emacs 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.
+;; GNU Emacs 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 GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -40,7 +39,8 @@
 (eval-when-compile (require 'cl))
 
 (defgroup dig nil
-  "Dig configuration.")
+  "Dig configuration."
+  :group 'comm)
 
 (defcustom dig-program "dig"
   "Name of dig (domain information groper) binary."
@@ -67,10 +67,10 @@ If nil, use system defaults."
 			  query-type query-class query-option
 			  dig-option server)
   "Call dig with given arguments and return buffer containing output.
-DOMAIN is a string with a DNS domain. QUERY-TYPE is an optional string
-with a DNS type. QUERY-CLASS is an optional string with a DNS class.
-QUERY-OPTION is an optional string with dig \"query options\".
-DIG-OPTIONS is an optional string with parameters for the dig program.
+DOMAIN is a string with a DNS domain.  QUERY-TYPE is an optional
+string with a DNS type.  QUERY-CLASS is an optional string with a DNS
+class.  QUERY-OPTION is an optional string with dig \"query options\".
+DIG-OPTION is an optional string with parameters for the dig program.
 SERVER is an optional string with a domain name server to query.
 
 Dig is an external program found in the BIND name server distribution,
@@ -128,32 +128,29 @@ Buffer should contain output generated by `dig-invoke'."
 
 (put 'dig-mode 'mode-class 'special)
 
-(defvar dig-mode-map nil)
-(unless dig-mode-map
-  (setq dig-mode-map (make-sparse-keymap))
-  (suppress-keymap dig-mode-map)
-
-  (define-key dig-mode-map "q" 'dig-exit))
+(defvar dig-mode-map
+  (let ((map (make-sparse-keymap)))
+    (suppress-keymap map)
+    (define-key map "q" 'dig-exit)
+    map))
 
-(defun dig-mode ()
+(define-derived-mode dig-mode nil "Dig"
   "Major mode for displaying dig output."
-  (interactive)
-  (kill-all-local-variables)
-  (setq mode-name "dig")
-  (setq major-mode 'dig-mode)
-  (use-local-map dig-mode-map)
   (buffer-disable-undo)
   (unless (featurep 'xemacs)
     (set (make-local-variable 'font-lock-defaults)
 	 '(dig-font-lock-keywords t)))
   (when (featurep 'font-lock)
-    (font-lock-set-defaults)))
+    ;; FIXME: what is this for??  --Stef
+    (font-lock-set-defaults))
+  )
 
 (defun dig-exit ()
   "Quit dig output buffer."
   (interactive)
   (kill-buffer (current-buffer)))
 
+;;;###autoload
 (defun dig (domain &optional
 		   query-type query-class query-option dig-option server)
   "Query addresses of a DOMAIN using dig, by calling `dig-invoke'.
@@ -168,6 +165,21 @@ Optional arguments are passed to `dig-invoke'."
   (setq buffer-read-only t)
   (set-buffer-modified-p nil))
 
+;; named for consistency with query-dns in dns.el
+(defun query-dig (domain &optional
+			 query-type query-class query-option dig-option server)
+  "Query addresses of a DOMAIN using dig.
+It works by calling `dig-invoke' and `dig-extract-rr'.
+Optional arguments are passed to `dig-invoke' and `dig-extract-rr'.
+Returns nil for domain/class/type queries that result in no data."
+(let ((buffer (dig-invoke domain query-type query-class
+			  query-option dig-option server)))
+  (when buffer
+    (switch-to-buffer buffer)
+    (let ((digger (dig-extract-rr domain query-type query-class)))
+      (kill-buffer buffer)
+      digger))))
+
 (provide 'dig)
 
 ;;; dig.el ends here