server spawn an nnrpd server. Another useful function to put in this
hook might be `nntp-send-authinfo', which will prompt for a password
to allow posting from the server. Note that this is only necessary to
-do on servers that use strict access control.")
+do on servers that use strict access control.")
(defvoo nntp-authinfo-function 'nntp-send-authinfo
"Function used to send AUTHINFO to the server.")
(defvoo nntp-server-action-alist
'(("nntpd 1\\.5\\.11t"
- (remove-hook 'nntp-server-opened-hook 'nntp-send-mode-reader)))
+ (remove-hook 'nntp-server-opened-hook 'nntp-send-mode-reader))
+ ("NNRP server Netscape"
+ (setq nntp-server-list-active-group nil)))
"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:
(defvoo nntp-rlogin-parameters '("telnet" "-8" "${NNTPSERVER:=news}" "nntp")
"*Parameters to `nntp-open-login'.
-That function may be used as `nntp-open-server-function'. In that
+That function may be used as `nntp-open-connection-function'. In that
case, this list will be used as the parameter list given to rsh.")
(defvoo nntp-rlogin-user-name nil
(defvoo nntp-telnet-parameters '("exec" "telnet" "-8" "${NNTPSERVER:=news}" "nntp")
"*Parameters to `nntp-open-telnet'.
-That function may be used as `nntp-open-server-function'. In that
+That function may be used as `nntp-open-connection-function'. In that
case, this list will be executed as a command after logging in
via telnet.")
(defvoo nntp-status-string "")
(defconst nntp-version "nntp 5.0")
(defvoo nntp-inhibit-erase nil)
+(defvoo nntp-inhibit-output nil)
(defvoo nntp-server-xover 'try)
(defvoo nntp-server-list-active-group 'try)
(save-excursion
(set-buffer (nntp-find-connection-buffer nntp-server-buffer))
(erase-buffer)
- (if (and (not gnus-nov-is-evil)
+ (if (and (not gnus-nov-is-evil)
(not nntp-nov-is-evil)
(nntp-retrieve-headers-with-xover articles fetch-old))
;; We successfully retrieved the headers via XOVER.
(while articles
(nntp-send-command
nil
- "HEAD" (if (numberp (car articles))
+ "HEAD" (if (numberp (car articles))
(int-to-string (car articles))
;; `articles' is either a list of article numbers
;; or a list of article IDs.
;; Now all of replies are received. Fold continuation lines.
(nnheader-fold-continuation-lines)
;; Remove all "\r"'s.
- (goto-char (point-min))
- (while (search-forward "\r" nil t)
- (replace-match "" t t))
+ (nnheader-strip-cr)
(copy-to-buffer nntp-server-buffer (point-min) (point-max))
'headers))))
(copy-to-buffer nntp-server-buffer (point-min) (point-max))
'group)
;; We have read active entries, so we just delete the
- ;; superfluos gunk.
+ ;; superfluous gunk.
(goto-char (point-min))
(while (re-search-forward "^[.2-5]" nil t)
- (delete-region (match-beginning 0)
+ (delete-region (match-beginning 0)
(progn (forward-line 1) (point))))
(copy-to-buffer nntp-server-buffer (point-min) (point-max))
'active))))
+(deffoo nntp-retrieve-articles (articles &optional group server)
+ (nntp-possibly-change-group group server)
+ (save-excursion
+ (let ((number (length articles))
+ (count 0)
+ (received 0)
+ (last-point (point-min))
+ (buf (nntp-find-connection-buffer nntp-server-buffer))
+ (nntp-inhibit-erase t)
+ (map (apply 'vector articles))
+ (point 1)
+ article alist)
+ (set-buffer buf)
+ (erase-buffer)
+ ;; Send HEAD command.
+ (while (setq article (pop articles))
+ (nntp-send-command
+ nil
+ "ARTICLE" (if (numberp article)
+ (int-to-string article)
+ ;; `articles' is either a list of article numbers
+ ;; or a list of article IDs.
+ article))
+ (incf count)
+ ;; Every 400 requests we have to read the stream in
+ ;; order to avoid deadlocks.
+ (when (or (null articles) ;All requests have been sent.
+ (zerop (% count nntp-maximum-request)))
+ (nntp-accept-response)
+ (while (progn
+ (progn
+ (set-buffer buf)
+ (goto-char last-point))
+ ;; Count replies.
+ (while (nntp-next-result-arrived-p)
+ (aset map received (cons (aref map received) (point)))
+ (incf received))
+ (setq last-point (point))
+ (< received count))
+ ;; If number of headers is greater than 100, give
+ ;; informative messages.
+ (and (numberp nntp-large-newsgroup)
+ (> number nntp-large-newsgroup)
+ (zerop (% received 20))
+ (message "NNTP: Receiving articles... %d%%"
+ (/ (* received 100) number)))
+ (nntp-accept-response))))
+ (and (numberp nntp-large-newsgroup)
+ (> number nntp-large-newsgroup)
+ (message "NNTP: Receiving headers...done"))
+
+ ;; Now we have all the responses. We go through the results,
+ ;; washes it and copies it over to the server buffer.
+ (set-buffer nntp-server-buffer)
+ (erase-buffer)
+ (mapcar
+ (lambda (entry)
+ (narrow-to-region
+ (setq point (goto-char (point-max)))
+ (progn
+ (insert-buffer-substring buf last-point (cdr entry))
+ (point-max)))
+ (nntp-decode-text)
+ (widen)
+ (cons (car entry) point))
+ map))))
+
+(defun nntp-next-result-arrived-p ()
+ (let ((point (point)))
+ (cond
+ ((looking-at "2")
+ (if (re-search-forward "\n.\r?\n" nil t)
+ t
+ (goto-char point)
+ nil))
+ ((looking-at "[34]")
+ (forward-line 1)
+ t)
+ (t
+ nil))))
+
(defun nntp-try-list-active (group)
(nntp-list-active-group group)
(save-excursion
+ (set-buffer nntp-server-buffer)
(goto-char (point-min))
- (cond ((looking-at "5[0-9]+")
+ (cond ((or (eobp)
+ (looking-at "5[0-9]+"))
(setq nntp-server-list-active-group nil))
(t
(setq nntp-server-list-active-group t)))))
(while (setq process (pop nntp-connection-list))
(when (memq (process-status process) '(open run))
(set-process-sentinel process nil)
- (nntp-send-string process "QUIT"))
+ (ignore-errors
+ (nntp-send-string process "QUIT")))
(when (buffer-name (process-buffer process))
(kill-buffer (process-buffer process))))))
(let* ((date (timezone-parse-date date))
(time-string
(format "%s%02d%02d %s%s%s"
- (substring (aref date 0) 2) (string-to-int (aref date 1))
+ (substring (aref date 0) 2) (string-to-int (aref date 1))
(string-to-int (aref date 2)) (substring (aref date 3) 0 2)
(substring
(aref date 3) 3 5) (substring (aref date 3) 6 8))))
"Send the AUTHINFO to the nntp server.
This function is supposed to be called from `nntp-server-opened-hook'.
It will prompt for a password."
- (nntp-send-command "^.*\r?\n" "AUTHINFO USER"
- (read-string "NNTP user name: "))
- (nntp-send-command "^.*\r?\n" "AUTHINFO PASS"
- (nnmail-read-passwd "NNTP password: ")))
+ (nntp-send-command
+ "^.*\r?\n" "AUTHINFO USER"
+ (read-string (format "NNTP (%s) user name: " nntp-address)))
+ (nntp-send-command
+ "^.*\r?\n" "AUTHINFO PASS"
+ (nnmail-read-passwd "NNTP (%s) password: " nntp-address)))
(defun nntp-send-authinfo ()
"Send the AUTHINFO to the nntp server.
This function is supposed to be called from `nntp-server-opened-hook'.
It will prompt for a password."
(nntp-send-command "^.*\r?\n" "AUTHINFO USER" (user-login-name))
- (nntp-send-command "^.*\r?\n" "AUTHINFO PASS"
- (read-string "NNTP password: ")))
+ (nntp-send-command
+ "^.*\r?\n" "AUTHINFO PASS"
+ (nnmail-read-passwd (format "NNTP (%s) password: " nntp-address))))
(defun nntp-send-authinfo-from-file ()
"Send the AUTHINFO to the nntp server.
This function is supposed to be called from `nntp-server-opened-hook'.
It will prompt for a password."
(when (file-exists-p "~/.nntp-authinfo")
- (save-excursion
- (set-buffer (get-buffer-create " *authinfo*"))
- (buffer-disable-undo (current-buffer))
- (erase-buffer)
+ (nnheader-temp-write nil
(insert-file-contents "~/.nntp-authinfo")
(goto-char (point-min))
(nntp-send-command "^.*\r?\n" "AUTHINFO USER" (user-login-name))
(nntp-send-command
"^.*\r?\n" "AUTHINFO PASS"
- (buffer-substring (point) (progn (end-of-line) (point))))
- (kill-buffer (current-buffer)))))
+ (buffer-substring (point) (progn (end-of-line) (point)))))))
;;; Internal functions.
(defun nntp-send-command (wait-for &rest strings)
"Send STRINGS to server and wait until WAIT-FOR returns."
- (unless nnheader-callback-function
+ (when (and (not nnheader-callback-function)
+ (not nntp-inhibit-output))
(save-excursion
(set-buffer nntp-server-buffer)
(erase-buffer)))
(nntp-retrieve-data
- (mapconcat 'identity strings " ")
+ (mapconcat 'identity strings " ")
nntp-address nntp-port-number nntp-server-buffer
wait-for nnheader-callback-function))
(defun nntp-send-command-nodelete (wait-for &rest strings)
"Send STRINGS to server and wait until WAIT-FOR returns."
(nntp-retrieve-data
- (mapconcat 'identity strings " ")
+ (mapconcat 'identity strings " ")
nntp-address nntp-port-number nntp-server-buffer
wait-for nnheader-callback-function))
(defun nntp-send-command-and-decode (wait-for &rest strings)
"Send STRINGS to server and wait until WAIT-FOR returns."
- (unless nnheader-callback-function
+ (when (and (not nnheader-callback-function)
+ (not nntp-inhibit-output))
(save-excursion
(set-buffer nntp-server-buffer)
(erase-buffer)))
(nntp-retrieve-data
- (mapconcat 'identity strings " ")
+ (mapconcat 'identity strings " ")
nntp-address nntp-port-number nntp-server-buffer
wait-for nnheader-callback-function t))
(defun nntp-send-buffer (wait-for)
"Send the current buffer to server and wait until WAIT-FOR returns."
- (unless nnheader-callback-function
+ (when (and (not nnheader-callback-function)
+ (not nntp-inhibit-output))
(save-excursion
(set-buffer (nntp-find-connection-buffer nntp-server-buffer))
(erase-buffer)))
(run-hooks 'nntp-prepare-server-hook)
(let* ((pbuffer (nntp-make-process-buffer buffer))
(process
- (condition-case ()
- (funcall
- nntp-open-connection-function pbuffer)
- (error nil))))
+ (ignore-errors
+ (funcall nntp-open-connection-function pbuffer))))
(when process
(process-kill-without-query process)
- (nntp-wait-for process "^.*\n" buffer)
+ (nntp-wait-for process "^.*\n" buffer nil t)
(if (memq (process-status process) '(open run))
(prog1
- (caar (push (list process buffer nil)
- nntp-connection-alist))
+ (caar (push (list process buffer nil) nntp-connection-alist))
(push process nntp-connection-list)
- (nntp-read-server-type)
- (run-hooks 'nntp-server-opened-hook))
+ (save-excursion
+ (set-buffer pbuffer)
+ (nntp-read-server-type)
+ (erase-buffer)
+ (set-buffer nntp-server-buffer)
+ (let ((nnheader-callback-function nil))
+ (run-hooks 'nntp-server-opened-hook))))
(when (buffer-name (process-buffer process))
(kill-buffer (process-buffer process)))
nil))))
;; Wait for the status string to arrive.
(setq nntp-server-type (buffer-string))
(let ((alist nntp-server-action-alist)
+ (case-fold-search t)
entry)
- ;; Run server-specific commmands.
+ ;; Run server-specific commands.
(while alist
(setq entry (pop alist))
(when (string-match (car entry) nntp-server-type)
(insert-buffer-substring cur start)
(narrow-to-region b (point-max))
(nntp-decode-text)
- (goto-char (point-min))
- (gnus-delete-line)
(widen)))))
(goto-char end)
(let ((callback nntp-process-callback)
(nntp-inside-change-function t))
(setq nntp-process-callback nil)
(save-excursion
- (funcall callback t))))))))
+ (funcall callback (buffer-name
+ (get-buffer nntp-process-to-buffer))))))))))
(defun nntp-retrieve-data (command address port buffer
&optional wait-for callback decode)
"Send STRING to PROCESS."
(process-send-string process (concat string nntp-end-of-line)))
-(defun nntp-wait-for (process wait-for buffer &optional decode)
+(defun nntp-wait-for (process wait-for buffer &optional decode discard)
"Wait for WAIT-FOR to arrive from PROCESS."
(save-excursion
(set-buffer (process-buffer process))
(nntp-accept-process-output process)
(goto-char (point-max)))
(nntp-decode-text (not decode))
- (save-excursion
- (set-buffer buffer)
- (goto-char (point-max))
- (insert-buffer-substring (process-buffer process))
- t))
- (erase-buffer))))
+ (unless discard
+ (save-excursion
+ (set-buffer buffer)
+ (goto-char (point-max))
+ (insert-buffer-substring (process-buffer process))
+ ;; Nix out "nntp reading...." message.
+ (message "")
+ t)))
+ (unless discard
+ (erase-buffer)))))
(defun nntp-snarf-error-message ()
"Save the error message in the current buffer."
- (setq nntp-status-string (buffer-string)))
+ (let ((message (buffer-string)))
+ (while (string-match "[\r\n]+" message)
+ (setq message (replace-match " " t t message)))
+ (nnheader-report 'nntp message)
+ message))
(defun nntp-accept-process-output (process)
"Wait for output from PROCESS and message some dots."
(nntp-accept-process-output (nntp-find-connection nntp-server-buffer)))
(defun nntp-possibly-change-group (group server &optional connectionless)
- (when server
- (or (nntp-server-opened server)
- (nntp-open-server server nil connectionless)))
+ (let ((nnheader-callback-function nil))
+ (when server
+ (or (nntp-server-opened server)
+ (nntp-open-server server nil connectionless)))
- (unless connectionless
- (or (nntp-find-connection nntp-server-buffer)
- (nntp-open-connection nntp-server-buffer)))
+ (unless connectionless
+ (or (nntp-find-connection nntp-server-buffer)
+ (nntp-open-connection nntp-server-buffer))))
(when group
(let ((entry (nntp-find-connection-entry nntp-server-buffer)))
(when (not (equal group (caddr entry)))
- (nntp-request-group group)))))
+ (save-excursion
+ (set-buffer (process-buffer (car entry)))
+ (erase-buffer)
+ (nntp-send-string (car entry) (concat "GROUP " group))
+ (nntp-wait-for-string "^2.*\n")
+ (setcar (cddr entry) group)
+ (erase-buffer))))))
(defun nntp-decode-text (&optional cr-only)
"Decode the text in the current buffer."
(while (search-forward "\r" nil t)
(delete-char -1))
(unless cr-only
+ ;; Remove trailing ".\n" end-of-transfer marker.
(goto-char (point-max))
(forward-line -1)
(when (looking-at ".\n")
(delete-char 2))
+ ;; Delete status line.
(goto-char (point-min))
(delete-region (point) (progn (forward-line 1) (point)))
+ ;; Remove "." -> ".." encoding.
(while (search-forward "\n.." nil t)
(delete-char -1))))
fetch-old)
(nntp-send-xover-command
(if fetch-old
- (if (numberp fetch-old)
- (max 1 (- (car articles) fetch-old))
+ (if (numberp fetch-old)
+ (max 1 (- (car articles) fetch-old))
1)
(car articles))
(car (last articles)) 'wait)
(setq first (car articles))
;; Search forward until we find a gap, or until we run out of
;; articles.
- (while (and (cdr articles)
+ (while (and (cdr articles)
(< (- (nth 1 articles) (car articles)) nntp-nov-gap))
(setq articles (cdr articles)))
;; a tendency to change the buffer. Perhaps. It's
;; quite difficult to reproduce, because it only
;; seems to happen once in a blue moon.
- (set-buffer buf)
+ (set-buffer buf)
(while (progn
(goto-char last-point)
;; Count replies.
;; If `nntp-server-xover' is a string, then we just send this
;; command.
(if wait-for-reply
- (nntp-send-command-nodelete "\r?\n\\.\r?\n" nntp-server-xover range)
+ (nntp-send-command-nodelete
+ "\r?\n\\.\r?\n" nntp-server-xover range)
;; We do not wait for the reply.
(nntp-send-command-nodelete "\r?\n\\.\r?\n" nntp-server-xover range))
(let ((commands nntp-xover-commands))
(string-match (format "\\([^ :]+\\):%d" number) xref))
(substring xref (match-beginning 1) (match-end 1)))
(t "")))
- (when (string-match "\r" group)
+ (when (string-match "\r" group)
(setq group (substring group 0 (match-beginning 0))))
(cons group number)))))
projects / gnus / blobdiff