;;; nntp.el --- nntp access for Gnus
-;; Copyright (C) 1987,88,89,90,92,93,94,95 Free Software Foundation, Inc.
+;; Copyright (C) 1987,88,89,90,92,93,94,95,96 Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
;; Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
;; 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; 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.
;;; Commentary:
;;; Code:
-(require 'rnews)
-(require 'sendmail)
(require 'nnheader)
+(require 'nnoo)
+(eval-when-compile (require 'cl))
+
+(nnoo-declare nntp)
+
+(eval-and-compile
+ (unless (fboundp 'open-network-stream)
+ (require 'tcp)))
(eval-when-compile (require 'cl))
(eval-and-compile
- (autoload 'news-setup "rnewspost")
- (autoload 'news-reply-mode "rnewspost")
(autoload 'cancel-timer "timer")
(autoload 'telnet "telnet" nil t)
(autoload 'telnet-send-input "telnet" nil t)
(autoload 'timezone-parse-date "timezone"))
-(defvar nntp-server-hook nil
+(defvoo nntp-server-hook nil
"*Hooks for the NNTP server.
If the kanji code of the NNTP server is different from the local kanji
code, the correct kanji code of the buffer associated with the NNTP
If you'd like to change something depending on the server in this
hook, use the variable `nntp-address'.")
-(defvar nntp-server-opened-hook nil
+(defvoo nntp-server-opened-hook '(nntp-send-mode-reader)
"*Hook used for sending commands to the server at startup.
The default value is `nntp-send-mode-reader', which makes an innd
server spawn an nnrpd server. Another useful function to put in this
do on servers that use strict access control.")
(add-hook 'nntp-server-opened-hook 'nntp-send-mode-reader)
-(defvar nntp-open-server-function 'nntp-open-network-stream
+(defvoo nntp-server-action-alist
+ '(("nntpd 1\\.5\\.11t"
+ (remove-hook 'nntp-server-opened-hook 'nntp-send-mode-reader)))
+ "Alist of regexps to match on server types and actions to be taken.
+For instance, if you want Gnus to beep every time you connect
+to innd, you could say something like:
+
+\(setq nntp-server-action-alist
+ '((\"innd\" (ding))))
+
+You probably don't want to do that, though.")
+
+(defvoo nntp-open-server-function 'nntp-open-network-stream
"*Function used for connecting to a remote system.
It will be called with the address of the remote system.
does an rlogin on the remote system, and then does a telnet to the
NNTP server available there (see nntp-rlogin-parameters).")
-(defvar nntp-rlogin-parameters '("telnet" "${NNTPSERVER:=localhost}" "nntp")
- "*Parameters to `nntp-open-login'.
+(defvoo nntp-rlogin-parameters '("telnet" "${NNTPSERVER:=localhost}" "nntp")
+ "*Parameters to `nntp-open-rlogin'.
That function may be used as `nntp-open-server-function'. In that
case, this list will be used as the parameter list given to rsh.")
-(defvar nntp-rlogin-user-name nil
+(defvoo nntp-rlogin-user-name nil
"*User name on remote system when using the rlogin connect method.")
-(defvar nntp-address nil
+(defvoo nntp-telnet-parameters '("exec" "telnet" "-8" "${NNTPSERVER:=localhost}" "nntp")
+ "*Parameters to `nntp-open-telnet'.
+That function may be used as `nntp-open-server-function'. In that
+case, this list will be executed as a command after logging in
+via telnet.")
+
+(defvoo nntp-telnet-user-name nil
+ "User name to log in via telnet with.")
+
+(defvoo nntp-telnet-passwd nil
+ "Password to use to log in via telnet with.")
+
+(defvoo nntp-address nil
"*The name of the NNTP server.")
-(defvar nntp-port-number "nntp"
+(defvoo nntp-port-number "nntp"
"*Port number to connect to.")
-(defvar nntp-large-newsgroup 50
+(defvoo nntp-end-of-line "\r\n"
+ "String to use on the end of lines when talking to the NNTP server.
+This is \"\\r\\n\" by default, but should be \"\\n\" when
+using rlogin or telnet to communicate with the server.")
+
+(defvoo nntp-large-newsgroup 50
"*The number of the articles which indicates a large newsgroup.
If the number of the articles is greater than the value, verbose
messages will be shown to indicate the current status.")
-(defvar nntp-buggy-select (memq system-type '(fujitsu-uts))
+(defvoo nntp-buggy-select (memq system-type '(fujitsu-uts))
"*t if your select routine is buggy.
If the select routine signals error or fall into infinite loop while
waiting for the server response, the variable must be set to t. In
case of Fujitsu UTS, it is set to T since `accept-process-output'
doesn't work properly.")
-(defvar nntp-maximum-request 400
+(defvoo nntp-maximum-request 400
"*The maximum number of the requests sent to the NNTP server at one time.
If Emacs hangs up while retrieving headers, set the variable to a
lower value.")
-(defvar nntp-debug-read 10000
+(defvoo nntp-debug-read 10000
"*Display '...' every 10Kbytes of a message being received if it is non-nil.
If it is a number, dots are displayed per the number.")
-(defvar nntp-nov-is-evil nil
+(defvoo nntp-nov-is-evil nil
"*If non-nil, nntp will never attempt to use XOVER when talking to the server.")
-(defvar nntp-xover-commands '("XOVER" "XOVERVIEW")
+(defvoo nntp-xover-commands '("XOVER" "XOVERVIEW")
"*List of strings that are used as commands to fetch NOV lines from a server.
The strings are tried in turn until a positive response is gotten. If
none of the commands are successful, nntp will just grab headers one
by one.")
-(defvar nntp-nov-gap 20
+(defvoo nntp-nov-gap 20
"*Maximum allowed gap between two articles.
If the gap between two consecutive articles is bigger than this
variable, split the XOVER request into two requests.")
-(defvar nntp-connection-timeout nil
+(defvoo nntp-connection-timeout nil
"*Number of seconds to wait before an nntp connection times out.
If this variable is nil, which is the default, no timers are set.")
-(defvar nntp-news-default-headers nil
+(defvoo nntp-command-timeout nil
+ "*Number of seconds to wait for a response when sending a command.
+If this variable is nil, which is the default, no timers are set.")
+
+(defvoo nntp-retry-on-break nil
+ "*If non-nil, re-send the command when the user types `C-g'.")
+
+(defvoo nntp-news-default-headers nil
"*If non-nil, override `mail-default-headers' when posting news.")
-(defvar nntp-prepare-server-hook nil
+(defvoo nntp-prepare-server-hook nil
"*Hook run before a server is opened.
If can be used to set up a server remotely, for instance. Say you
have an account at the machine \"other.machine\". This machine has
then use this hook to rsh to the remote machine and start a proxy NNTP
server there that you can connect to.")
-(defvar nntp-async-number 5
+(defvoo nntp-async-number 5
"*How many articles should be prefetched when in asynchronous mode.")
-(defvar nntp-warn-about-losing-connection t
+(defvoo nntp-warn-about-losing-connection t
"*If non-nil, beep when a server closes connection.")
\f
(defvar nntp-server-buffer nil
"Buffer associated with the NNTP server process.")
-(defvar nntp-server-process nil
+(defvoo nntp-server-process nil
"The NNTP server process.
You'd better not use this variable in NNTP front-end program, but
instead use `nntp-server-buffer'.")
-(defvar nntp-status-string nil
- "Save the server response message.
-You'd better not use this variable in NNTP front-end program but
-instead call function `nntp-status-message' to get status message.")
+(defvoo nntp-status-string nil
+ "Save the server response message.")
(defvar nntp-opened-connections nil
"All (possibly) opened connections.")
-(defvar nntp-server-xover 'try)
-(defvar nntp-server-list-active-group 'try)
-(defvar nntp-current-group "")
-
-(defvar nntp-async-process nil)
-(defvar nntp-async-buffer nil)
-(defvar nntp-async-articles nil)
-(defvar nntp-async-fetched nil)
-(defvar nntp-async-group-alist nil)
+(defvoo nntp-server-xover 'try)
+(defvoo nntp-server-list-active-group 'try)
+(defvoo nntp-current-group "")
+(defvoo nntp-server-type nil)
-
-\f
-(defvar nntp-current-server nil)
-(defvar nntp-server-alist nil)
-(defvar nntp-server-variables
- `((nntp-server-hook ,nntp-server-hook)
- (nntp-server-opened-hook ,nntp-server-opened-hook)
- (nntp-port-number ,nntp-port-number)
- (nntp-address ,nntp-address)
- (nntp-large-newsgroup ,nntp-large-newsgroup)
- (nntp-buggy-select ,nntp-buggy-select)
- (nntp-maximum-request ,nntp-maximum-request)
- (nntp-debug-read ,nntp-debug-read)
- (nntp-nov-is-evil ,nntp-nov-is-evil)
- (nntp-xover-commands ,nntp-xover-commands)
- (nntp-connection-timeout ,nntp-connection-timeout)
- (nntp-news-default-headers ,nntp-news-default-headers)
- (nntp-prepare-server-hook ,nntp-prepare-server-hook)
- (nntp-async-number ,nntp-async-number)
- (nntp-async-process nil)
- (nntp-async-buffer nil)
- (nntp-async-articles nil)
- (nntp-async-fetched nil)
- (nntp-async-group-alist nil)
- (nntp-server-process nil)
- (nntp-status-string nil)
- (nntp-server-xover try)
- (nntp-server-list-active-group try)
- (nntp-current-group "")))
+(defvoo nntp-async-process nil)
+(defvoo nntp-async-buffer nil)
+(defvoo nntp-async-articles nil)
+(defvoo nntp-async-fetched nil)
+(defvoo nntp-async-group-alist nil)
\f
;;; Interface functions.
-(defun nntp-retrieve-headers (articles &optional group server fetch-old)
+(nnoo-define-basics nntp)
+
+(deffoo nntp-retrieve-headers (articles &optional group server fetch-old)
"Retrieve the headers of ARTICLES."
(nntp-possibly-change-server group server)
(save-excursion
(let ((number (length articles))
(count 0)
(received 0)
+ (message-log-max nil)
(last-point (point-min)))
;; Send HEAD command.
(while articles
(and (numberp nntp-large-newsgroup)
(> number nntp-large-newsgroup)
(zerop (% received 20))
- (message "NNTP: Receiving headers... %d%%"
- (/ (* received 100) number)))
+ (nnheader-message 7 "NNTP: Receiving headers... %d%%"
+ (/ (* received 100) number)))
(nntp-accept-response))))
;; Wait for text of last command.
(goto-char (point-max))
(nntp-accept-response)))
(and (numberp nntp-large-newsgroup)
(> number nntp-large-newsgroup)
- (message "NNTP: Receiving headers...done"))
+ (nnheader-message 7 "NNTP: Receiving headers...done"))
;; Now all of replies are received. Fold continuation lines.
(nnheader-fold-continuation-lines)
'headers))))
-(defun nntp-retrieve-groups (groups &optional server)
+(deffoo nntp-retrieve-groups (groups &optional server)
"Retrieve group info on GROUPS."
(nntp-possibly-change-server nil server)
(save-excursion
(progn (forward-line 1) (point))))
'active))))
-(defun nntp-open-server (server &optional defs connectionless)
+(deffoo nntp-open-server (server &optional defs connectionless)
"Open the virtual server SERVER.
If CONNECTIONLESS is non-nil, don't attempt to connect to any physical
servers."
- (nnheader-init-server-buffer)
+ ;; Called with just a port number as the defs.
+ (when (or (stringp (car defs))
+ (numberp (car defs)))
+ (setq defs `((nntp-port-number ,(car defs)))))
+ (unless (assq 'nntp-address defs)
+ (setq defs (append defs `((nntp-address ,server)))))
+ (nnoo-change-server 'nntp server defs)
(if (nntp-server-opened server)
t
- (if (or (stringp (car defs))
- (numberp (car defs)))
- (setq defs (cons (list 'nntp-port-number (car defs)) (cdr defs))))
- (or (assq 'nntp-address defs)
- (setq defs (append defs (list (list 'nntp-address server)))))
- (if (and nntp-current-server
- (not (equal server nntp-current-server)))
- (setq nntp-server-alist
- (cons (list nntp-current-server
- (nnheader-save-variables nntp-server-variables))
- nntp-server-alist)))
- (let ((state (assoc server nntp-server-alist)))
- (if state
- (progn
- (nnheader-restore-variables (nth 1 state))
- (setq nntp-server-alist (delq state nntp-server-alist)))
- (nnheader-set-init-variables nntp-server-variables defs)))
- (setq nntp-current-server server)
(or (nntp-server-opened server)
connectionless
- (progn
- (run-hooks 'nntp-prepare-server-hook)
- (nntp-open-server-semi-internal nntp-address nntp-port-number)))))
+ (prog2
+ (run-hooks 'nntp-prepare-server-hook)
+ (nntp-open-server-semi-internal nntp-address nntp-port-number)
+ (nnheader-insert "")))))
-(defun nntp-close-server (&optional server)
+(deffoo nntp-close-server (&optional server)
"Close connection to SERVER."
(nntp-possibly-change-server nil server t)
(unwind-protect
(process-sentinel nntp-server-process))
(set-process-sentinel nntp-server-process nil))
;; We cannot send QUIT command unless the process is running.
- (if (nntp-server-opened)
- (nntp-send-command nil "QUIT")))
+ (when (nntp-server-opened server)
+ (nntp-send-command nil "QUIT")
+ ;; Give the QUIT time to arrive.
+ (sleep-for 1)))
(nntp-close-server-internal server)))
-(defalias 'nntp-request-quit (symbol-function 'nntp-close-server))
-
-(defun nntp-request-close ()
+(deffoo nntp-request-close ()
"Close all server connections."
(let (proc)
- (while nntp-opened-connections
- (when (setq proc (pop nntp-opened-connections))
- (condition-case ()
- (process-send-string proc "QUIT\n")
- (error nil))
- (delete-process proc)))
- (and nntp-async-buffer
- (get-buffer nntp-async-buffer)
- (kill-buffer nntp-async-buffer))
- (while nntp-server-alist
- (and (setq proc (nth 1 (assq 'nntp-async-buffer
- (car nntp-server-alist))))
- (buffer-name proc)
- (kill-buffer proc))
- (setq nntp-server-alist (cdr nntp-server-alist)))
- (setq nntp-current-server nil
- nntp-async-group-alist nil)))
-
-(defun nntp-server-opened (&optional server)
+ (while nntp-opened-connections
+ (when (setq proc (pop nntp-opened-connections))
+ ;; Un-set default sentinel function before closing connection.
+ (when (eq 'nntp-default-sentinel (process-sentinel proc))
+ (set-process-sentinel proc nil))
+ (condition-case ()
+ (process-send-string proc (concat "QUIT" nntp-end-of-line))
+ (error nil))
+ ;; Give the QUIT time to reach the server before we close
+ ;; down the process.
+ (sleep-for 1)
+ (delete-process proc)))
+ (and nntp-async-buffer
+ (buffer-name nntp-async-buffer)
+ (kill-buffer nntp-async-buffer))
+ (let ((alist (cddr (assq 'nntp nnoo-state-alist)))
+ entry)
+ (while (setq entry (pop alist))
+ (and (setq proc (cdr (assq 'nntp-async-buffer entry)))
+ (buffer-name proc)
+ (kill-buffer proc))))
+ (nnoo-close-server 'nntp)
+ (setq nntp-async-group-alist nil
+ nntp-async-articles nil)))
+
+(deffoo nntp-server-opened (&optional server)
"Say whether a connection to SERVER has been opened."
- (and (equal server nntp-current-server)
+ (and (nnoo-current-server-p 'nntp server)
nntp-server-buffer
(buffer-name nntp-server-buffer)
nntp-server-process
(memq (process-status nntp-server-process) '(open run))))
-(defun nntp-status-message (&optional server)
+(deffoo nntp-status-message (&optional server)
"Return server status as a string."
(if (and nntp-status-string
;; NNN MESSAGE
;; Empty message if nothing.
(or nntp-status-string "")))
-(defun nntp-request-article (id &optional group server buffer)
+(deffoo nntp-request-article (id &optional group server buffer)
"Request article ID (Message-ID or number)."
(nntp-possibly-change-server group server)
(let ((nntp-server-buffer (or buffer nntp-server-buffer))
(art (or (and (numberp id) (int-to-string id)) id)))
(prog1
- (and (nntp-send-command "^\\.\r?\n" "ARTICLE" art)
+ (and (nntp-send-command
+ ;; A bit odd regexp to ensure working over rlogin.
+ "^\\.\r?\n" "ARTICLE" art)
(if (numberp id)
(cons nntp-current-group id)
;; We find out what the article number was.
(when buffer
(set-process-buffer nntp-server-process nntp-server-buffer))))))
-(defun nntp-request-body (id &optional group server)
+(deffoo nntp-request-body (id &optional group server)
"Request body of article ID (Message-ID or number)."
(nntp-possibly-change-server group server)
(prog1
"^\\.\r?\n" "BODY" (or (and (numberp id) (int-to-string id)) id))
(nntp-decode-text)))
-(defun nntp-request-head (id &optional group server)
+(deffoo nntp-request-head (id &optional group server)
"Request head of article ID (Message-ID or number)."
(nntp-possibly-change-server group server)
(prog1
- (and (nntp-send-command
- "^\\.\r?\n" "HEAD" (if (numberp id) (int-to-string id) id))
- (if (numberp id) id
- ;; We find out what the article number was.
- (nntp-find-group-and-number)))
- (nntp-decode-text)))
+ (when (nntp-send-command
+ "^\\.\r?\n" "HEAD" (if (numberp id) (int-to-string id) id))
+ (if (numberp id) id
+ ;; We find out what the article number was.
+ (nntp-find-group-and-number)))
+ (nntp-decode-text)
+ (save-excursion
+ (set-buffer nntp-server-buffer)
+ (nnheader-fold-continuation-lines))))
-(defun nntp-request-stat (id &optional group server)
+(deffoo nntp-request-stat (id &optional group server)
"Request STAT of article ID (Message-ID or number)."
(nntp-possibly-change-server group server)
(nntp-send-command
"^[23].*\r?\n" "STAT" (or (and (numberp id) (int-to-string id)) id)))
-(defun nntp-request-group (group &optional server dont-check)
+(deffoo nntp-request-type (group &optional article)
+ 'news)
+
+(deffoo nntp-request-group (group &optional server dont-check)
"Select GROUP."
+ (nntp-possibly-change-server nil server)
(setq nntp-current-group
(when (nntp-send-command "^2.*\r?\n" "GROUP" group)
group)))
-(defun nntp-request-asynchronous (group &optional server articles)
+(deffoo nntp-request-asynchronous (group &optional server articles)
"Enable pre-fetch in GROUP."
(when nntp-async-articles
(nntp-async-request-group group))
(nntp-async-send-strings "GROUP" group)
t)))
-(defun nntp-list-active-group (group &optional server)
+(deffoo nntp-list-active-group (group &optional server)
"Return the active info on GROUP (which can be a regexp."
(nntp-possibly-change-server group server)
(nntp-send-command "^.*\r?\n" "LIST ACTIVE" group))
-(defun nntp-request-group-description (group &optional server)
+(deffoo nntp-request-group-description (group &optional server)
"Get the description of GROUP."
(nntp-possibly-change-server nil server)
(prog1
(nntp-send-command "^.*\r?\n" "XGTITLE" group)
(nntp-decode-text)))
-(defun nntp-close-group (group &optional server)
+(deffoo nntp-close-group (group &optional server)
"Close GROUP."
(setq nntp-current-group nil)
t)
-(defun nntp-request-list (&optional server)
+(deffoo nntp-request-list (&optional server)
"List all active groups."
(nntp-possibly-change-server nil server)
(prog1
(nntp-send-command "^\\.\r?\n" "LIST")
(nntp-decode-text)))
-(defun nntp-request-list-newsgroups (&optional server)
+(deffoo nntp-request-list-newsgroups (&optional server)
"Get descriptions on all groups on SERVER."
(nntp-possibly-change-server nil server)
(prog1
(nntp-send-command "^\\.\r?\n" "LIST NEWSGROUPS")
(nntp-decode-text)))
-(defun nntp-request-newgroups (date &optional server)
+(deffoo nntp-request-newgroups (date &optional server)
"List groups that have arrived since DATE."
(nntp-possibly-change-server nil server)
(let* ((date (timezone-parse-date date))
(nntp-send-command "^\\.\r?\n" "NEWGROUPS" time-string)
(nntp-decode-text))))
-(defun nntp-request-list-distributions (&optional server)
+(deffoo nntp-request-list-distributions (&optional server)
"List distributions."
(nntp-possibly-change-server nil server)
(prog1
(nntp-send-command "^\\.\r?\n" "LIST DISTRIBUTIONS")
(nntp-decode-text)))
-(defun nntp-request-last (&optional group server)
+(deffoo nntp-request-last (&optional group server)
"Decrease the current article pointer."
(nntp-possibly-change-server group server)
(nntp-send-command "^[23].*\r?\n" "LAST"))
-(defun nntp-request-next (&optional group server)
+(deffoo nntp-request-next (&optional group server)
"Advance the current article pointer."
(nntp-possibly-change-server group server)
(nntp-send-command "^[23].*\r?\n" "NEXT"))
-(defun nntp-request-post (&optional server)
+(deffoo nntp-request-post (&optional server)
"Post the current buffer."
(nntp-possibly-change-server nil server)
(when (nntp-send-command "^[23].*\r?\n" "POST")
+ (nnheader-insert "")
(nntp-encode-text)
(nntp-send-region-to-server (point-min) (point-max))
;; 1.2a NNTP's post command is buggy. "^M" (\r) is not
(defun nntp-default-sentinel (proc status)
"Default sentinel function for NNTP server process."
- (let ((servers nntp-server-alist)
+ (let ((servers (cddr (assq 'nntp nnoo-state-alist)))
server)
;; Go through the alist of server names and find the name of the
;; server that the process that sent the signal is connected to.
(if (equal proc nntp-server-process)
(setq server nntp-address)
(while (and servers
- (not (equal proc (nth 1 (assq 'nntp-server-process
- (car servers))))))
+ (not (equal proc (cdr (assq 'nntp-server-process
+ (car servers))))))
(setq servers (cdr servers)))
- (setq server (car (car servers))))
+ (setq server (caar servers)))
(when (and server
nntp-warn-about-losing-connection)
- (message "nntp: Connection closed to server %s" server)
+ (nnheader-message 3 "nntp: Connection closed to server %s" server)
+ (setq nntp-current-group "")
(ding))))
(defun nntp-kill-connection (server)
"Choke the connection to SERVER."
- (let ((proc (nth 1 (assq 'nntp-server-process
- (assoc server nntp-server-alist)))))
+ (let ((proc (cdr (assq 'nntp-server-process
+ (assoc server (cddr
+ (assq 'nntp nnoo-state-alist)))))))
(when proc
(delete-process (process-name proc)))
(nntp-close-server server)
- (setq nntp-status-string
- (message "Connection timed out to server %s." server))
+ (nnheader-report
+ 'nntp (message "Connection timed out to server %s" server))
(ding)
(sit-for 1)))
(save-excursion
;; Replace `.' at beginning of line with `..'.
(goto-char (point-min))
- (while (search-forward "\n." nil t)
+ (while (re-search-forward "^\\." nil t)
(insert "."))
(goto-char (point-max))
;; Insert newline at end of buffer.
(or (bolp) (insert "\n"))
+ ;(goto-char (point-min))
+ ;(while (not (eobp))
+ ; (end-of-line)
+ ; (insert "\r")
+ ; (forward-line 1))
;; Insert `.' at end of buffer (end of text mark).
- (insert ".\r\n")))
+ (goto-char (point-max))
+ (insert "." nntp-end-of-line)))
+
\f
;;;
;;; Synchronous Communication with NNTP servers.
;;;
+(defvar nntp-retry-command)
+
(defun nntp-send-command (response cmd &rest args)
+ "Wait for server RESPONSE after sending CMD and optional ARGS to server."
+ (let ((timer
+ (and nntp-command-timeout
+ (nnheader-run-at-time
+ nntp-command-timeout nil 'nntp-kill-command
+ (nnoo-current-server 'nntp))))
+ (nntp-retry-command t)
+ result)
+ (unwind-protect
+ (save-excursion
+ (while nntp-retry-command
+ (setq nntp-retry-command nil)
+ ;; Clear communication buffer.
+ (set-buffer nntp-server-buffer)
+ (widen)
+ (erase-buffer)
+ (if nntp-retry-on-break
+ (condition-case ()
+ (progn
+ (apply 'nntp-send-strings-to-server cmd args)
+ (setq result
+ (if response
+ (nntp-wait-for-response response)
+ t)))
+ (quit (setq nntp-retry-command t)))
+ (apply 'nntp-send-strings-to-server cmd args)
+ (setq result
+ (if response
+ (nntp-wait-for-response response)
+ t))))
+ result)
+ (when timer
+ (nnheader-cancel-timer timer)))))
+
+(defun nntp-kill-command (server)
+ "Kill and restart the connection to SERVER."
+ (let ((proc (cdr (assq
+ 'nntp-server-process
+ (assoc server (cddr (assq 'nntp nnoo-state-alist)))))))
+ (when proc
+ (delete-process (process-name proc)))
+ (nntp-close-server server)
+ (nntp-open-server server)
+ (when nntp-current-group
+ (nntp-request-group nntp-current-group))
+ (setq nntp-retry-command t)))
+
+(defun nntp-send-command-old (response cmd &rest args)
"Wait for server RESPONSE after sending CMD and optional ARGS to server."
(save-excursion
;; Clear communication buffer.
;; Save status message.
(end-of-line)
(setq nntp-status-string
- (buffer-substring (point-min) (point)))
+ (nnheader-replace-chars-in-string
+ (buffer-substring (point-min) (point)) ?\r ? ))
(when status
(setq wait t)
(while wait
(goto-char (point-max))
- (forward-line -1)
+ (if (bolp) (forward-line -1) (beginning-of-line))
(if (looking-at regexp)
(setq wait nil)
(when nntp-debug-read
- (let ((newnum (/ (buffer-size) dotsize)))
- (if (not (= dotnum newnum))
- (progn
- (setq dotnum newnum)
- (message "NNTP: Reading %s"
- (make-string dotnum ?.))))))
+ (let ((newnum (/ (buffer-size) dotsize))
+ (message-log-max nil))
+ (unless (= dotnum newnum)
+ (setq dotnum newnum)
+ (nnheader-message 7 "NNTP: Reading %s"
+ (make-string dotnum ?.)))))
(nntp-accept-response)))
;; Remove "...".
(when (and nntp-debug-read (> dotnum 0))
;; order to avoid deadlocks.
(when (or (null articles) ;All requests have been sent.
(zerop (% count nntp-maximum-request)))
- (accept-process-output)
+ (accept-process-output nntp-server-process 1)
;; On some Emacs versions the preceding function has
;; a tendency to change the buffer. Perhaps. It's
- ;; quite difficult to reporduce, because it only
+ ;; quite difficult to reproduce, because it only
;; seems to happen once in a blue moon.
(set-buffer buf)
(while (progn
(setq received (1+ received)))
(setq last-point (point))
(< received count))
- (accept-process-output)
+ (accept-process-output nntp-server-process)
(set-buffer buf)))))
(when nntp-server-xover
(defun nntp-send-xover-command (beg end &optional wait-for-reply)
"Send the XOVER command to the server."
- (let ((range (format "%d-%d" beg end)))
+ (let ((range (format "%d-%d" (or beg 1) (or end beg 1))))
(if (stringp nntp-server-xover)
;; If `nntp-server-xover' is a string, then we just send this
;; command.
(defun nntp-send-strings-to-server (&rest strings)
"Send STRINGS to the server."
- (let ((cmd (concat (mapconcat 'identity strings " ") "\r\n")))
+ (let ((cmd (concat (mapconcat 'identity strings " ") nntp-end-of-line)))
;; We open the nntp server if it is down.
- (or (nntp-server-opened nntp-current-server)
- (nntp-open-server nntp-current-server)
+ (or (nntp-server-opened (nnoo-current-server 'nntp))
+ (nntp-open-server (nnoo-current-server 'nntp))
(error (nntp-status-message)))
;; Send the strings.
(process-send-string nntp-server-process cmd)
(defun nntp-send-region-to-server (begin end)
"Send the current buffer region (from BEGIN to END) to the server."
(save-excursion
- ;; If we're not the the nntp server buffer, we copy the region
- ;; over to that buffer.
- (if (eq (get-buffer nntp-server-buffer) (current-buffer))
- (let ((orig (current-buffer)))
- (set-buffer nntp-server-buffer)
- (erase-buffer)
- (insert-buffer-substring orig begin end))
- ;; We are in the nntp buffer, so we just narrow it.
- (narrow-to-region begin end))
- ;; `process-send-region' does not work if the text to be sent is very
- ;; large, so we send it piecemeal.
- (let ((last (point-min))
- (size 100)) ;Size of text sent at once.
- (while (/= last (point-max))
- (process-send-region
- nntp-server-process last (setq last (min (+ last size) (point-max))))
- ;; Read any output from the server. May be unnecessary.
- (accept-process-output)))
- ;; Delete the area we sent.
- (delete-region (point-min) (point-max))
- (widen)))
+ (let ((cur (current-buffer)))
+ ;; Copy the buffer over to the send buffer.
+ (nnheader-set-temp-buffer " *nntp send*")
+ (insert-buffer-substring cur begin end)
+ (save-excursion
+ (set-buffer cur)
+ (erase-buffer))
+ ;; `process-send-region' does not work if the text to be sent is very
+ ;; large, so we send it piecemeal.
+ (let ((last (point-min))
+ (size 100)) ;Size of text sent at once.
+ (while (and (/= last (point-max))
+ (memq (process-status nntp-server-process) '(open run)))
+ (process-send-region
+ nntp-server-process
+ last (setq last (min (+ last size) (point-max))))
+ ;; Read any output from the server. May be unnecessary.
+ (accept-process-output)))
+ (kill-buffer (current-buffer)))))
(defun nntp-open-server-semi-internal (server &optional service)
"Open SERVER.
If SERVER is nil, use value of environment variable `NNTPSERVER'.
-If SERVICE, this this as the port number."
+If SERVICE, use this as the port number."
+ (nnheader-insert "")
(let ((server (or server (getenv "NNTPSERVER")))
(status nil)
(timer
(and nntp-connection-timeout
- (cond
- ((fboundp 'run-at-time)
- (run-at-time nntp-connection-timeout
- nil 'nntp-kill-connection server))
- ((fboundp 'start-itimer)
- ;; Not sure if this will work or not, only one way to
- ;; find out
- (eval '(start-itimer "nntp-timeout"
- (lambda ()
- (nntp-kill-connection server))
- nntp-connection-timeout nil)))))))
+ (nnheader-run-at-time nntp-connection-timeout
+ nil 'nntp-kill-connection server))))
(save-excursion
(set-buffer nntp-server-buffer)
(setq nntp-status-string "")
- (message "nntp: Connecting to server on %s..." server)
+ (nnheader-message 5 "nntp: Connecting to server on %s..." nntp-address)
(cond ((and server (nntp-open-server-internal server service))
(setq nntp-address server)
(setq status
(condition-case nil
(nntp-wait-for-response "^[23].*\r?\n" 'slow)
(error nil)
- (quit nil)))
- (or status (nntp-close-server-internal server))
- (and nntp-server-process
- (progn
- (set-process-sentinel
- nntp-server-process 'nntp-default-sentinel)
- ;; You can send commands at startup like AUTHINFO here.
- ;; Added by Hallvard B Furuseth <h.b.furuseth@usit.uio.no>
- (run-hooks 'nntp-server-opened-hook))))
+ ;(quit nil)
+ ))
+ (unless status
+ (nntp-close-server-internal server)
+ (nnheader-report
+ 'nntp "Couldn't open connection to %s"
+ (if (and nntp-address
+ (not (equal nntp-address "")))
+ nntp-address server)))
+ (when nntp-server-process
+ (set-process-sentinel
+ nntp-server-process 'nntp-default-sentinel)
+ ;; You can send commands at startup like AUTHINFO here.
+ ;; Added by Hallvard B Furuseth <h.b.furuseth@usit.uio.no>
+ (run-hooks 'nntp-server-opened-hook)))
((null server)
- (setq nntp-status-string "NNTP server is not specified."))
+ (nnheader-report 'nntp "NNTP server is not specified."))
(t ; We couldn't open the server.
- (setq nntp-status-string
- (buffer-substring (point-min) (point-max)))))
- (and timer (cancel-timer timer))
+ (nnheader-report 'nntp (buffer-string))))
+ (when timer
+ (nnheader-cancel-timer timer))
(message "")
- (or status
- (setq nntp-current-server nil
- nntp-async-number nil))
+ (unless status
+ (nnoo-close-server 'nntp server)
+ (setq nntp-async-number nil))
status)))
+(defvar nntp-default-directories '("~" "/tmp" "/")
+ "Directories to as current directory in the nntp server buffer.")
+
(defun nntp-open-server-internal (server &optional service)
"Open connection to news server on SERVER by SERVICE (default is nntp)."
(let (proc)
(save-excursion
- ;; Use TCP/IP stream emulation package if needed.
- (or (fboundp 'open-network-stream)
- (require 'tcp))
- ;; Initialize communication buffer.
- (nnheader-init-server-buffer)
(set-buffer nntp-server-buffer)
- (if (setq proc
- (condition-case nil
- (funcall nntp-open-server-function server)
- (error nil)))
- (progn
- (setq nntp-server-process proc)
- ;; Suggested by Hallvard B Furuseth <h.b.furuseth@usit.uio.no>.
- (process-kill-without-query proc)
- (setq nntp-address server)
- ;; It is possible to change kanji-fileio-code in this hook.
- (run-hooks 'nntp-server-hook)
- (push proc nntp-opened-connections)
- nntp-server-process)
- (setq nntp-status-string (format "Couldn't open server %s" server))
- nil))))
+ ;; Make sure we have a valid current directory for the
+ ;; nntp server buffer.
+ (unless (file-exists-p default-directory)
+ (let ((dirs nntp-default-directories))
+ (while dirs
+ (when (file-exists-p (car dirs))
+ (setq default-directory (car dirs)
+ dirs nil))
+ (setq dirs (cdr dirs)))))
+ (cond
+ ((and (setq proc
+ (condition-case nil
+ (funcall nntp-open-server-function server)
+ (error nil)))
+ (memq (process-status proc) '(open run)))
+ (setq nntp-server-process proc)
+ (setq nntp-address server)
+ ;; Suggested by Hallvard B Furuseth <h.b.furuseth@usit.uio.no>.
+ (process-kill-without-query proc)
+ (run-hooks 'nntp-server-hook)
+ (push proc nntp-opened-connections)
+ (condition-case ()
+ (nntp-read-server-type)
+ (error
+ (nnheader-report 'nntp "Couldn't open server %s" server)
+ (nntp-close-server)))
+ nntp-server-process)
+ (t
+ (nnheader-report 'nntp "Couldn't open server %s" server))))))
+
+(defun nntp-read-server-type ()
+ "Find out what the name of the server we have connected to is."
+ ;; Wait for the status string to arrive.
+ (nntp-wait-for-response "^.*\n" t)
+ (setq nntp-server-type (buffer-string))
+ (let ((alist nntp-server-action-alist)
+ entry)
+ ;; Run server-specific commmands.
+ (while alist
+ (setq entry (pop alist))
+ (when (string-match (car entry) nntp-server-type)
+ (if (and (listp (cadr entry))
+ (not (eq 'lambda (caadr entry))))
+ (eval (cadr entry))
+ (funcall (cadr entry)))))))
(defun nntp-open-network-stream (server)
(open-network-stream
"nntpd" nntp-server-buffer server nntp-port-number))
(defun nntp-open-rlogin (server)
- (let ((proc (start-process "nntpd" nntp-server-buffer "rsh" server)))
- (process-send-string proc (mapconcat 'identity nntp-rlogin-parameters
- " "))
- (process-send-string proc "\n")))
-
-(defun nntp-telnet-to-machine ()
- (let (b)
- (telnet "localhost")
+ (let ((proc (if nntp-rlogin-user-name
+ (start-process
+ "nntpd" nntp-server-buffer "rsh"
+ "-l" nntp-rlogin-user-name server
+ (mapconcat 'identity
+ nntp-rlogin-parameters " "))
+ (start-process
+ "nntpd" nntp-server-buffer "rsh" server
+ (mapconcat 'identity
+ nntp-rlogin-parameters " ")))))
+ proc))
+
+(defun nntp-wait-for-string (regexp)
+ "Wait until string arrives in the buffer."
+ (let ((buf (current-buffer)))
(goto-char (point-min))
- (while (not (re-search-forward "^login: *" nil t))
- (sit-for 1)
- (goto-char (point-min)))
- (goto-char (point-max))
- (insert "larsi")
- (telnet-send-input)
- (setq b (point))
- (while (not (re-search-forward ">" nil t))
- (sit-for 1)
- (goto-char b))
- (goto-char (point-max))
- (insert "ls")
- (telnet-send-input)))
+ (while (not (re-search-forward regexp nil t))
+ (accept-process-output nntp-server-process)
+ (set-buffer buf)
+ (goto-char (point-min)))))
+
+(defun nntp-open-telnet (server)
+ (save-excursion
+ (set-buffer nntp-server-buffer)
+ (erase-buffer)
+ (let ((proc (start-process
+ "nntpd" nntp-server-buffer "telnet" "-8"))
+ (case-fold-search t))
+ (when (memq (process-status proc) '(open run))
+ (process-send-string proc "set escape \^X\n")
+ (process-send-string proc (concat "open " server "\n"))
+ (nntp-wait-for-string "^\r*login:")
+ (process-send-string
+ proc (concat
+ (or nntp-telnet-user-name
+ (setq nntp-telnet-user-name (read-string "login: ")))
+ "\n"))
+ (nntp-wait-for-string "^\r*password:")
+ (process-send-string
+ proc (concat
+ (or nntp-telnet-passwd
+ (setq nntp-telnet-passwd
+ (nnmail-read-passwd "Password: ")))
+ "\n"))
+ (erase-buffer)
+ (nntp-wait-for-string "bash\\|\$ *\r?$\\|> *\r?")
+ (process-send-string
+ proc (concat (mapconcat 'identity nntp-telnet-parameters " ") "\n"))
+ (nntp-wait-for-string "^\r*200")
+ (beginning-of-line)
+ (delete-region (point-min) (point))
+ (process-send-string proc "\^]")
+ (nntp-wait-for-string "^telnet")
+ (process-send-string proc "mode character\n")
+ (accept-process-output proc 1)
+ (sit-for 1)
+ (goto-char (point-min))
+ (forward-line 1)
+ (delete-region (point) (point-max)))
+ proc)))
(defun nntp-close-server-internal (&optional server)
"Close connection to news server."
(if nntp-server-process
(delete-process nntp-server-process))
(setq nntp-server-process nil)
- (setq nntp-address ""))
+ ;(setq nntp-address "")
+ )
(defun nntp-accept-response ()
"Read response of server.
;; We cannot use `accept-process-output'.
;; Fujitsu UTS requires messages during sleep-for.
;; I don't know why.
- (message "NNTP: Reading...")
+ (nnheader-message 5 "NNTP: Reading...")
(sleep-for 1)
- (message ""))
+ (nnheader-message 5 ""))
(condition-case errorcode
- (accept-process-output nntp-server-process)
+ (accept-process-output nntp-server-process 1)
(error
(cond ((string-equal "select error: Invalid argument"
(nth 1 errorcode))
(defun nntp-possibly-change-server (newsgroup server &optional connectionless)
"Check whether the virtual server needs changing."
- (if (and server
- (not (nntp-server-opened server)))
- ;; This virtual server isn't open, so we (re)open it here.
- (nntp-open-server server nil t))
- (if (and newsgroup
- (not (equal newsgroup nntp-current-group)))
- ;; Set the proper current group.
- (nntp-request-group newsgroup server)))
+ (when (and server
+ (not (nntp-server-opened server)))
+ ;; This virtual server isn't open, so we (re)open it here.
+ (nntp-open-server server nil t))
+ (when (and newsgroup
+ (not (equal newsgroup nntp-current-group)))
+ ;; Set the proper current group.
+ (nntp-request-group newsgroup server)))
(defun nntp-try-list-active (group)
(nntp-list-active-group group)
nart)
(while (and (>= (setq max (1- max)) 0)
articles)
- (or (memq (setq nart (car (car articles))) nntp-async-fetched)
+ (or (memq (setq nart (caar articles)) nntp-async-fetched)
(progn
(nntp-async-send-strings "ARTICLE " (int-to-string nart))
(setq nntp-async-fetched (cons nart nntp-async-fetched))))
(setq articles (cdr articles))))))
(defun nntp-async-send-strings (&rest strings)
- (let ((cmd (concat (mapconcat 'identity strings " ") "\r\n")))
+ (let ((cmd (concat (mapconcat 'identity strings " ") nntp-end-of-line)))
(or (nntp-async-server-opened)
(nntp-async-open-server)
(error (nntp-status-message)))
projects / gnus / blobdiff