[Emacs-diffs] Changes to emacs/lisp/net/dns.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       07/12/01 21:02:07

Index: dns.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/dns.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- dns.el      1 Dec 2007 20:58:03 -0000       1.1
+++ dns.el      1 Dec 2007 21:02:07 -0000       1.2
@@ -1,6 +1,7 @@
 ;;; dns.el --- Domain Name Service lookups
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, 
Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <address@hidden>
 ;; Keywords: network
@@ -26,10 +27,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))
-
-(require 'mm-util)
-
 (defvar dns-timeout 5
   "How many seconds to wait when doing DNS queries.")
 
@@ -105,10 +102,11 @@
   (dns-write-bytes 0))
 
 (defun dns-read-string-name (string buffer)
-  (mm-with-unibyte-buffer
+  (let (default-enable-multibyte-characters)
+    (with-temp-buffer
     (insert string)
     (goto-char (point-min))
-    (dns-read-name buffer)))
+      (dns-read-name buffer))))
 
 (defun dns-read-name (&optional buffer)
   (let ((ended nil)
@@ -188,7 +186,8 @@
     (buffer-string)))
 
 (defun dns-read (packet)
-  (mm-with-unibyte-buffer
+  (let (default-enable-multibyte-characters)
+    (with-temp-buffer
     (let ((spec nil)
          queries answers authorities additionals)
       (insert packet)
@@ -252,7 +251,7 @@
                               type))))
                qs))
        (push (list slot qs) spec)))
-    (nreverse spec))))
+        (nreverse spec)))))
 
 (defun dns-read-int32 ()
   ;; Full 32 bit Integers can't be handled by Emacs.  If we use
@@ -264,7 +263,8 @@
   (let ((buffer (current-buffer))
        (point (point)))
     (prog1
-       (mm-with-unibyte-buffer
+        (let (default-enable-multibyte-characters)
+          (with-temp-buffer
          (insert string)
          (goto-char (point-min))
          (cond
@@ -277,7 +277,8 @@
            (let (hextets)
              (dotimes (i 8)
                (push (dns-read-bytes 2) hextets))
-             (mapconcat (lambda (n) (format "%x" n)) (nreverse hextets) ":")))
+                (mapconcat (lambda (n) (format "%x" n))
+                           (nreverse hextets) ":")))
           ((eq type 'SOA)
            (list (list 'mname (dns-read-name buffer))
                  (list 'rname (dns-read-name buffer))
@@ -295,7 +296,7 @@
            (cons (dns-read-bytes 2) (dns-read-name buffer)))
           ((or (eq type 'CNAME) (eq type 'NS) (eq type 'PTR))
            (dns-read-string-name string buffer))
-          (t string)))
+             (t string))))
       (goto-char point))))
 
 (defun dns-parse-resolv-conf ()
@@ -377,11 +378,13 @@
 
   (if (not dns-servers)
       (message "No DNS server configuration found")
-    (mm-with-unibyte-buffer
+    (let (default-enable-multibyte-characters)
+      (with-temp-buffer
       (let ((process (condition-case ()
                         (dns-make-network-process (car dns-servers))
                       (error
-                       (message "dns: Got an error while trying to talk to %s"
+                          (message
+                           "dns: Got an error while trying to talk to %s"
                                 (car dns-servers))
                        nil)))
            (tcp-p (and (not (fboundp 'make-network-process))
@@ -401,9 +404,10 @@
                      (> times 0))
            (sit-for (/ step 1000.0))
            (accept-process-output process 0 step)
-           (decf times step))
-         (ignore-errors
-           (delete-process process))
+              (setq times (- times step)))
+            (condition-case nil
+                (delete-process process)
+              (error nil))
          (when (and tcp-p
                     (>= (buffer-size) 2))
            (goto-char (point-min))
@@ -418,7 +422,7 @@
                  (when (eq type (dns-get 'type answer))
                    (if (eq type 'TXT)
                        (dns-get-txt-answer (dns-get 'answers result))
-                     (dns-get 'data answer))))))))))))
+                        (dns-get 'data answer)))))))))))))
 
 (provide 'dns)