projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(gnus-large-newsgroup): Mention gnus-large-ephemeral-newsgroup.
[gnus]
/
lisp
/
dns.el
diff --git
a/lisp/dns.el
b/lisp/dns.el
index
eb7a8e1
..
2d4c2d8
100644
(file)
--- a/
lisp/dns.el
+++ b/
lisp/dns.el
@@
-1,10
+1,10
@@
;;; dns.el --- Domain Name Service lookups
;;; dns.el --- Domain Name Service lookups
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
, 2009, 2010
;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
-;; Keywords: network
+;; Keywords: network
comm
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
@@
-101,7
+101,7
@@
If nil, /etc/resolv.conf and nslookup will be consulted.")
(defun dns-read-string-name (string buffer)
(with-temp-buffer
(defun dns-read-string-name (string buffer)
(with-temp-buffer
- (
set-buffer-multibyte nil
)
+ (
unless (featurep 'xemacs) (set-buffer-multibyte nil)
)
(insert string)
(goto-char (point-min))
(dns-read-name buffer)))
(insert string)
(goto-char (point-min))
(dns-read-name buffer)))
@@
-135,7
+135,7
@@
If nil, /etc/resolv.conf and nslookup will be consulted.")
"Write a DNS packet according to SPEC.
If TCP-P, the first two bytes of the package with be the length field."
(with-temp-buffer
"Write a DNS packet according to SPEC.
If TCP-P, the first two bytes of the package with be the length field."
(with-temp-buffer
- (
set-buffer-multibyte nil
)
+ (
unless (featurep 'xemacs) (set-buffer-multibyte nil)
)
(dns-write-bytes (dns-get 'id spec) 2)
(dns-write-bytes
(logior
(dns-write-bytes (dns-get 'id spec) 2)
(dns-write-bytes
(logior
@@
-151,7
+151,7
@@
If TCP-P, the first two bytes of the package with be the length field."
(lsh (if (dns-get 'truncated-p spec) 1 0) -1)
(lsh (if (dns-get 'recursion-desired-p spec) 1 0) 0)))
(dns-write-bytes
(lsh (if (dns-get 'truncated-p spec) 1 0) -1)
(lsh (if (dns-get 'recursion-desired-p spec) 1 0) 0)))
(dns-write-bytes
- (cond
+ (cond
((eq (dns-get 'response-code spec) 'no-error) 0)
((eq (dns-get 'response-code spec) 'format-error) 1)
((eq (dns-get 'response-code spec) 'server-failure) 2)
((eq (dns-get 'response-code spec) 'no-error) 0)
((eq (dns-get 'response-code spec) 'format-error) 1)
((eq (dns-get 'response-code spec) 'server-failure) 2)
@@
-186,7
+186,7
@@
If TCP-P, the first two bytes of the package with be the length field."
(defun dns-read (packet)
(with-temp-buffer
(defun dns-read (packet)
(with-temp-buffer
- (
set-buffer-multibyte nil
)
+ (
unless (featurep 'xemacs) (set-buffer-multibyte nil)
)
(let ((spec nil)
queries answers authorities additionals)
(insert packet)
(let ((spec nil)
queries answers authorities additionals)
(insert packet)
@@
-263,7
+263,7
@@
If TCP-P, the first two bytes of the package with be the length field."
(point (point)))
(prog1
(with-temp-buffer
(point (point)))
(prog1
(with-temp-buffer
-
(set-buffer-multibyte nil
)
+
(unless (featurep 'xemacs) (set-buffer-multibyte nil)
)
(insert string)
(goto-char (point-min))
(cond
(insert string)
(goto-char (point-min))
(cond
@@
-314,8
+314,8
@@
Parses \"/etc/resolv.conf\" or calls \"nslookup\"."
(call-process "nslookup" nil t nil "localhost")
(goto-char (point-min))
(re-search-forward
(call-process "nslookup" nil t nil "localhost")
(goto-char (point-min))
(re-search-forward
- "^
Server
:[ \t]*\\([0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+\\)" nil t)
- (setq dns-servers
) (list (match-string 1
))))))
+ "^
Address
:[ \t]*\\([0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+\\)" nil t)
+ (setq dns-servers
(list (match-string 1)
))))))
(defun dns-read-txt (string)
(if (> (length string) 1)
(defun dns-read-txt (string)
(if (> (length string) 1)
@@
-391,7
+391,7
@@
If REVERSEP, look up an IP address."
(if (not dns-servers)
(message "No DNS server configuration found")
(with-temp-buffer
(if (not dns-servers)
(message "No DNS server configuration found")
(with-temp-buffer
- (
set-buffer-multibyte nil
)
+ (
unless (featurep 'xemacs) (set-buffer-multibyte nil)
)
(let ((process (condition-case ()
(dns-make-network-process (car dns-servers))
(error
(let ((process (condition-case ()
(dns-make-network-process (car dns-servers))
(error
@@
-438,5
+438,4
@@
If REVERSEP, look up an IP address."
(provide 'dns)
(provide 'dns)
-;; arch-tag: d0edd0c4-4cce-4538-ae92-06c3356ee80a
;;; dns.el ends here
;;; dns.el ends here