;;; pop3.el --- Post Office Protocol (RFC 1460) interface
-;; Copyright (C) 1996-1999 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+;; Free Software Foundation, Inc.
;; Author: Richard L. Pieri <ratinox@peorth.gweep.net>
;; Daiki Ueno <ueno@ueda.info.waseda.ac.jp>
-;; Keywords: mail, pop3
-;; Version: 1.3s
+;; Maintainer: FSF
+;; Keywords: mail
;; This file is part of GNU Emacs.
;;; Code:
(eval-when-compile (require 'cl))
-(require 'mail-utils)
+(eval-when-compile (require 'static))
-(defconst pop3-version "1.3s")
+(require 'mail-utils)
(defvar pop3-maildrop (or (user-login-name) (getenv "LOGNAME") (getenv "USER") nil)
"*POP3 maildrop.")
(autoload 'starttls-open-stream "starttls")
(autoload 'starttls-negotiate "starttls"))
+(defvar pop3-ssl-program-name
+ (if (exec-installed-p "openssl")
+ "openssl"
+ "ssleay")
+ "The program to run in a subprocess to open an SSL connection.")
+
(defvar pop3-ssl-program-arguments
- '("-quiet")
+ '("s_client" "-quiet")
"Arguments to be passed to the program `pop3-ssl-program-name'.")
(defun pop3-progress-message (format percent &rest args)
(let* ((process (pop3-open-server pop3-mailhost pop3-port))
(crashbuf (get-buffer-create " *pop3-retr*"))
(n 1)
+ message-count
(pop3-password pop3-password)
- (pop3-uidl-file-name
- (convert-standard-filename
- (concat pop3-uidl-file-name "-" pop3-mailhost)))
- (retrieved-messages nil)
- messages message-count)
+ (pop3-uidl-file-name (convert-standard-filename
+ (concat pop3-uidl-file-name "-"
+ pop3-mailhost)))
+ retrieved-messages messages)
;; for debugging only
(if pop3-debug (switch-to-buffer (process-buffer process)))
;; query for password
(message "Retrieving message list...")
(setq messages (pop3-get-message-numbers process)
message-count (length (cdr messages)))
- (message (format "Retrieving message list...%d of %d unread"
- message-count (pop messages)))
+ (message "Retrieving message list...%d of %d unread"
+ message-count (pop messages))
(unwind-protect
(unless (not (stringp crashbox))
(while messages
;; now delete the messages we have retrieved
(unless pop3-leave-mail-on-server
(dolist (n retrieved-messages)
- (message (format "Deleting message %d of %d from %s..."
- n message-count pop3-mailhost))
+ (message "Deleting message %d of %d from %s..."
+ n message-count pop3-mailhost)
(pop3-dele process n)))
)
(pop3-quit process))
(kill-buffer crashbuf)
message-count))
+(defun pop3-get-message-count ()
+ "Return the number of messages in the maildrop."
+ (let* ((process (pop3-open-server pop3-mailhost pop3-port))
+ message-count
+ (pop3-password pop3-password)
+ )
+ ;; for debugging only
+ (if pop3-debug (switch-to-buffer (process-buffer process)))
+ ;; query for password
+ (if (and pop3-password-required (not pop3-password))
+ (setq pop3-password
+ (pop3-read-passwd (format "Password for %s: " pop3-maildrop))))
+ (cond ((equal 'apop pop3-authentication-scheme)
+ (pop3-apop process pop3-maildrop))
+ ((equal 'pass pop3-authentication-scheme)
+ (pop3-user process pop3-maildrop)
+ (pop3-pass process))
+ (t (error "Invalid POP3 authentication scheme.")))
+ (setq message-count (car (pop3-stat process)))
+ (pop3-quit process)
+ message-count))
+
(defun pop3-open-server (mailhost port)
- "Open TCP connection to MAILHOST.
+ "Open TCP connection to MAILHOST on PORT.
Returns the process associated with the connection.
Argument PORT specifies connecting port."
- (let ((process-buffer
- (get-buffer-create (format "trace of POP session to %s" mailhost)))
- (process))
+ (let (process)
(save-excursion
- (set-buffer process-buffer)
- (erase-buffer))
- (setq
- process
- (cond
- ((eq pop3-connection-type 'ssl)
- (pop3-open-ssl-stream "POP" process-buffer mailhost port))
- ((eq pop3-connection-type 'tls)
- (pop3-open-tls-stream "POP" process-buffer mailhost port))
- (t
- (open-network-stream-as-binary "POP" process-buffer mailhost port))))
- (setq pop3-read-point (point-min))
- (let ((response (pop3-read-response process t)))
- (setq pop3-timestamp
- (substring response (or (string-match "<" response) 0)
- (+ 1 (or (string-match ">" response) -1)))))
- process))
+ (set-buffer (get-buffer-create (concat " trace of POP session to "
+ mailhost)))
+ (erase-buffer)
+ (setq pop3-read-point (point-min))
+ (setq
+ process
+ (cond
+ ((eq pop3-connection-type 'ssl)
+ (pop3-open-ssl-stream "POP" (current-buffer) mailhost port))
+ ((eq pop3-connection-type 'tls)
+ (pop3-open-tls-stream "POP" (current-buffer) mailhost port))
+ (t
+ (open-network-stream-as-binary "POP" (current-buffer)
+ mailhost port))))
+ (let ((response (pop3-read-response process t)))
+ (setq pop3-timestamp
+ (substring response (or (string-match "<" response) 0)
+ (+ 1 (or (string-match ">" response) -1)))))
+ process)))
(defun pop3-open-ssl-stream-1 (name buffer host service extra-arg)
- (let* ((ssl-program-arguments
+ (require 'path-util)
+ (let* ((ssl-program-name
+ pop3-ssl-program-name)
+ (ssl-program-arguments
`(,@pop3-ssl-program-arguments ,extra-arg
"-connect" ,(format "%s:%d" host service)))
(process (open-ssl-stream name buffer host service)))
"Open a SSL connection for a service to a host.
Returns a subprocess-object to represent the connection.
Args are NAME BUFFER HOST SERVICE."
- (as-binary-process
- (or (pop3-open-ssl-stream-1 name buffer host service "-ssl3")
- (pop3-open-ssl-stream-1 name buffer host service "-ssl2"))))
+ (cond ((eq system-type 'windows-nt)
+ (let (selective-display
+ (coding-system-for-write 'binary)
+ (coding-system-for-read 'raw-text-dos))
+ (or (pop3-open-ssl-stream-1 name buffer host service "-ssl3")
+ (pop3-open-ssl-stream-1 name buffer host service "-ssl2"))))
+ (t
+ (as-binary-process
+ (or (pop3-open-ssl-stream-1 name buffer host service "-ssl3")
+ (pop3-open-ssl-stream-1 name buffer host service "-ssl2"))))))
(defun pop3-open-tls-stream (name buffer host service)
"Open a TLSv1 connection for a service to a host.
(setq match-end (point))
(goto-char pop3-read-point)
(if (looking-at "-ERR")
- (signal 'error (list (buffer-substring (point) (- match-end 2))))
+ (error (buffer-substring (point) (- match-end 2)))
(if (not (looking-at "+OK"))
(progn (setq pop3-read-point match-end) nil)
(setq pop3-read-point match-end)
(defvar pop3-read-passwd nil)
(defun pop3-read-passwd (prompt)
(if (not pop3-read-passwd)
- (if (functionp 'read-passwd)
+ (if (fboundp 'read-passwd)
(setq pop3-read-passwd 'read-passwd)
(if (load "passwd" t)
(setq pop3-read-passwd 'read-passwd)
(forward-char)))
(set-marker end nil))
+(eval-when-compile (defvar parse-time-months))
+
+;; Copied from message-make-date.
+(defun pop3-make-date (&optional now)
+ "Make a valid date header.
+If NOW, use that time instead."
+ (require 'parse-time)
+ (let* ((now (or now (current-time)))
+ (zone (nth 8 (decode-time now)))
+ (sign "+"))
+ (when (< zone 0)
+ (setq sign "-")
+ (setq zone (- zone)))
+ (concat
+ (format-time-string "%d" now)
+ ;; The month name of the %b spec is locale-specific. Pfff.
+ (format " %s "
+ (capitalize (car (rassoc (nth 4 (decode-time now))
+ parse-time-months))))
+ (format-time-string "%Y %H:%M:%S " now)
+ ;; We do all of this because XEmacs doesn't have the %z spec.
+ (format "%s%02d%02d" sign (/ zone 3600) (/ (% zone 3600) 60)))))
+
(defun pop3-munge-message-separator (start end)
"Check to see if a message separator exists. If not, generate one."
- (if (not (fboundp 'parse-time-string))
- (autoload 'parse-time-string "parse-time"))
(save-excursion
(save-restriction
(narrow-to-region start end)
(looking-at "BABYL OPTIONS:") ; Babyl
))
(let ((from (mail-strip-quoted-names (mail-fetch-field "From")))
- (date (mail-fetch-field "Date"))
+ (date (split-string (or (mail-fetch-field "Date")
+ (pop3-make-date))
+ " "))
(From_))
;; sample date formats I have seen
;; Date: Tue, 9 Jul 1996 09:04:21 -0400 (EDT)
;; Date: 08 Jul 1996 23:22:24 -0400
;; should be
;; Tue Jul 9 09:04:21 1996
- (setq date (format-time-string
- "%a %b %e %T %Y"
- (if date
- (condition-case nil
- (apply 'encode-time (parse-time-string date))
- (error (current-time)))
- (current-time))))
+ (setq date
+ (cond ((string-match "[A-Z]" (nth 0 date))
+ (format "%s %s %s %s %s"
+ (nth 0 date) (nth 2 date) (nth 1 date)
+ (nth 4 date) (nth 3 date)))
+ (t
+ ;; this really needs to be better but I don't feel
+ ;; like writing a date to day converter.
+ (format "Sun %s %s %s %s"
+ (nth 1 date) (nth 0 date)
+ (nth 3 date) (nth 2 date)))
+ ))
(setq From_ (format "\nFrom %s %s\n" from date))
(while (string-match "," From_)
(setq From_ (concat (substring From_ 0 (match-beginning 0))
(substring From_ (match-end 0)))))
(goto-char (point-min))
- (insert From_))))))
+ (insert From_)
+ (if (search-forward "\n\n" nil t)
+ nil
+ (goto-char (point-max))
+ (insert "\n"))
+ (narrow-to-region (point) (point-max))
+ (let ((size (- (point-max) (point-min))))
+ (goto-char (point-min))
+ (widen)
+ (forward-line -1)
+ (insert (format "Content-Length: %s\n" size)))
+ )))))
;; UIDL support
(lambda (atom)
(when (car (symbol-value atom))
(insert (format "%s\n" atom))))
- pop3-uidl-obarray)))))
-
+ pop3-uidl-obarray)))
+ (fillarray pop3-uidl-obarray 0)))
+
;; The Command Set
(if (not (and response (string-match "+OK" response)))
(pop3-quit process))))
-(autoload 'md5 "md5")
+(static-unless (and (fboundp 'md5) (subrp (symbol-function 'md5)))
+ (eval-and-compile
+ (require 'path-util)
+ (if (module-installed-p 'md5)
+ (progn
+ (autoload 'md5 "md5")
+ (fset 'pop3-md5 'md5))
+
+ (defvar pop3-md5-program "md5"
+ "*Program to encode its input in MD5.")
+
+ (defun pop3-md5 (string)
+ (with-temp-buffer
+ (insert string)
+ (call-process-region (point-min) (point-max)
+ (or shell-file-name "/bin/sh")
+ t (current-buffer) nil
+ "-c" pop3-md5-program)
+ ;; The meaningful output is the first 32 characters.
+ ;; Don't return the newline that follows them!
+ (buffer-substring (point-min) (+ (point-min) 32))))
+ )))
(defun pop3-apop (process user)
"Send alternate authentication information to the server."
- (let ((hash (md5 (concat pop3-timestamp pop3-password))))
- (pop3-send-command process (format "APOP %s %s" user hash))
- (let ((response (pop3-read-response process t)))
- (if (not (and response (string-match "+OK" response)))
- (pop3-quit process)))))
+ (let ((pass pop3-password))
+ (if (and pop3-password-required (not pass))
+ (setq pass
+ (pop3-read-passwd (format "Password for %s: " pop3-maildrop))))
+ (if pass
+ (let ((hash (static-if (and (fboundp 'md5)
+ (subrp (symbol-function 'md5)))
+ (md5 (concat pop3-timestamp pass))
+ (pop3-md5 (concat pop3-timestamp pass)))))
+ (pop3-send-command process (format "APOP %s %s" user hash))
+ (let ((response (pop3-read-response process t)))
+ (if (not (and response (string-match "+OK" response)))
+ (pop3-quit process)))))
+ ))
(defun pop3-stls (process)
"Query whether TLS extension is supported"
"Return the number of messages in the maildrop and the maildrop's size."
(pop3-send-command process "STAT")
(let ((response (pop3-read-response process t)))
- (list (string-to-int (nth 1 (split-string response)))
- (string-to-int (nth 2 (split-string response))))
+ (list (string-to-int (nth 1 (split-string response " ")))
+ (string-to-int (nth 2 (split-string response " "))))
))
(defun pop3-retr (process msg crashbuf)
"Return highest accessed message-id number for the session."
(pop3-send-command process "LAST")
(let ((response (pop3-read-response process t)))
- (string-to-int (nth 1 (split-string response)))
+ (string-to-int (nth 1 (split-string response " ")))
))
(defun pop3-rset (process)
(save-excursion
(set-buffer (process-buffer process))
(goto-char (point-max))
- (delete-process process)
- ))
- (when pop3-leave-mail-on-server
- (mapatoms
- (lambda (atom)
- (when (car (symbol-value atom))
- (unintern atom pop3-uidl-obarray)))
- pop3-uidl-obarray)))
+ (delete-process process))))
(defun pop3-uidl (process &optional msgno)
"Return the results of a UIDL command in PROCESS for optional MSGNO.
projects / elisp / gnus.git- / blobdiff