;;; pop3.el --- Post Office Protocol (RFC 1460) interface
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
;; Free Software Foundation, Inc.
;; Author: Richard L. Pieri <ratinox@peorth.gweep.net>
;; This program was inspired by Kyle E. Jones's vm-pop program.
-;; You have to set the variable `pop3-connection-type' to `ssl' or
-;; `tls' expressly, if you would like to use this module with Gnus
-;; (not T-gnus) for those connection types. For examples:
+;;; Gnus:
+
+;; You can use this program for Gnus, without needing any modification.
+;; There are two ways to do that; one is to replace Gnus' pop3.el with
+;; it when installing Gnus; the other is to replace Gnus' pop3.el which
+;; has been installed with this module and byte-compile it.
+
+;; Note: you should not modify the value for the `pop' section of the
+;; `mail-source-keyword-map' variable.
+
+;; This program provides the following features in addition to Gnus:
+
+;; 1. You can use SSL or STARTTLS stream to connect to mail servers.
+;; For example, specify the `:connection' keyword and the value pair
+;; in a mail-source as follows:
+;;
+;;(setq mail-sources '((pop :server "pop3.mail.server" :port 995
+;; :connection ssl :authentication apop)))
;;
-;;(setq mail-sources '((pop :server "POPSERVER" :port 995 :connection ssl
-;; :authentication apop)))
-;;(setq pop3-connection-type 'ssl)
+;; For STARTTLS stream, use `tls' isntead of `ssl'. The default
+;; connection type is defined by `pop3-connection-type' which
+;; defaults to nil.
+
+;; 2. You can fetch mails without deleting them in mail servers. To do
+;; that, specify the `:leave' keyword with the value t as follows:
+;;
+;;(setq mail-sources '((pop :server "pop3.mail.server" :leave t)))
+;;
+;; Already read mails are registered into the ~/.uidls-SERVER file
+;; (which is the default, see `pop3-uidl-file-name'), and you will
+;; never need to fetch them twice. The default value for the
+;; `:leave' keyword is specified by the `pop3-leave-mail-on-server'
+;; variable. You have no need to modify that value normally.
+
+;; 3. See the source code for some other miscellaneous extended features.
;;; Code:
(eval-when-compile
- (require 'cl)
- ;; For compiling this module in Gnus with XEmacs -no-autoloads.
- (require 'advice))
-
-;; as-binary-process, open-network-stream-as-binary, write-region-as-binary
-(require 'pces)
-;; exec-installed-p
-(require 'path-util)
+ (require 'cl))
(require 'mail-utils)
-(defvar pop3-maildrop (or (user-login-name) (getenv "LOGNAME") (getenv "USER") nil)
- "*POP3 maildrop.")
-(defvar pop3-mailhost (or (getenv "MAILHOST") nil)
- "*POP3 mailhost.")
-(defvar pop3-port 110
- "*POP3 port.")
-(defvar pop3-connection-type nil
- "*POP3 connection type.")
-
-(defvar pop3-password-required t
- "*Non-nil if a password is required when connecting to POP server.")
+(defgroup pop3 nil
+ "Post Office Protocol"
+ :group 'mail
+ :group 'mail-source)
+
+(defcustom pop3-maildrop (or (user-login-name)
+ (getenv "LOGNAME")
+ (getenv "USER"))
+ "*POP3 maildrop."
+ :version "21.4" ;; Oort Gnus
+ :type 'string
+ :group 'pop3)
+
+(defcustom pop3-mailhost (or (getenv "MAILHOST") ;; nil -> mismatch
+ "pop3")
+ "*POP3 mailhost."
+ :version "21.4" ;; Oort Gnus
+ :type 'string
+ :group 'pop3)
+
+(defcustom pop3-port 110
+ "*POP3 port."
+ :version "21.4" ;; Oort Gnus
+ :type 'number
+ :group 'pop3)
+
+(defcustom pop3-connection-type nil
+ "*POP3 connection type."
+ :type '(choice (const :tag "Not specified" nil)
+ (const tls)
+ (const ssl))
+ :group 'pop3)
+
+(defcustom pop3-password-required t
+ "*Non-nil if a password is required when connecting to POP server."
+ :version "21.4" ;; Oort Gnus
+ :type 'boolean
+ :group 'pop3)
+
+;; Should this be customizable?
(defvar pop3-password nil
"*Password to use when connecting to POP server.")
-(defvar pop3-authentication-scheme 'pass
+(defcustom pop3-authentication-scheme 'pass
"*POP3 authentication scheme.
Defaults to 'pass, for the standard USER/PASS authentication. Other valid
-values are 'apop.")
+values are 'apop."
+ :version "21.4" ;; Oort Gnus
+ :type '(choice (const :tag "USER/PASS" pass)
+ (const :tag "APOP" apop))
+ :group 'pop3)
+
+(defcustom pop3-leave-mail-on-server nil
+ "*Non-nil if the mail is to be left on the POP server after fetching."
+ :version "21.4" ;; Oort Gnus
+ :type 'boolean
+ :group 'pop3)
(defvar pop3-timestamp nil
"Timestamp returned when initially connected to the POP server.
Used for APOP authentication.")
-(defvar pop3-leave-mail-on-server nil
- "Non-nil if mail is to be left on the server and UIDL used for message retrieval.")
+(defcustom pop3-maximum-message-size nil
+ "If non-nil only download messages smaller than this."
+ :type '(choice (const :tag "Unlimited" nil)
+ (integer :tag "Maximum size" :format "%t: %v\n" :size 0))
+ :group 'pop3)
-(defvar pop3-maximum-message-size nil
- "If non-nil only download messages smaller than this.")
+(defcustom pop3-except-header-regexp nil
+ "If non-nil we do not retrieve messages whose headers are matching this regexp."
+ :type '(choice (const :tag "Retrieve any messages" nil)
+ (regexp :format "%t: %v\n" :size 0))
+ :group 'pop3)
-(defvar pop3-except-header-regexp nil
- "If non-nil we do not retrieve messages whose headers are matching this regexp.")
-
-(defvar pop3-uidl-file-name "~/.uidls"
- "File in which to store the UIDL of processed messages.")
+(defcustom pop3-uidl-file-name "~/.uidls"
+ "File in which to store the UIDL of processed messages."
+ :type '(file :format "%t: %v\n" :size 0)
+ :group 'pop3)
(defvar pop3-uidl-support nil
"Alist of servers and flags of whether they support UIDLs.
(autoload 'starttls-open-stream "starttls")
(autoload 'starttls-negotiate "starttls"))
-(defvar pop3-ssl-program-name
- (if (exec-installed-p "openssl")
+(defcustom pop3-ssl-program-name
+ (if (executable-find "openssl")
"openssl"
"ssleay")
- "The program to run in a subprocess to open an SSL connection.")
+ "The program to run in a subprocess to open an SSL connection."
+ :type '(string :format "%t: %v\n" :size 0)
+ :group 'pop3)
-(defvar pop3-ssl-program-arguments
+(defcustom pop3-ssl-program-arguments
'("s_client" "-quiet")
- "Arguments to be passed to the program `pop3-ssl-program-name'.")
+ "Arguments to be passed to the program `pop3-ssl-program-name'."
+ :type '(repeat (string :format "%v\n" :size 0))
+ :group 'pop3)
(defun pop3-progress-message (format percent &rest args)
(apply (function message) format args))
+;; Borrowed from nnheader-accept-process-output in nnheader.el.
+(defvar pop3-read-timeout
+ (if (string-match "windows-nt\\|os/2\\|emx\\|cygwin"
+ (symbol-name system-type))
+ ;; http://thread.gmane.org/v9655t3pjo.fsf@marauder.physik.uni-ulm.de
+ ;;
+ ;; IIRC, values lower than 1.0 didn't/don't work on Windows/DOS.
+ ;;
+ ;; There should probably be a runtime test to determine the timing
+ ;; resolution, or a primitive to report it. I don't know off-hand
+ ;; what's possible. Perhaps better, maybe the Windows/DOS primitive
+ ;; could round up non-zero timeouts to a minimum of 1.0?
+ 1.0
+ 0.1)
+ "How long pop3 should wait between checking for the end of output.
+Shorter values mean quicker response, but are more CPU intensive.")
+
+;; Borrowed from nnheader-accept-process-output in nnheader.el.
+(defun pop3-accept-process-output (process)
+ (accept-process-output
+ process
+ (truncate pop3-read-timeout)
+ (truncate (* (- pop3-read-timeout
+ (truncate pop3-read-timeout))
+ 1000))))
+
(defun pop3-movemail (&optional crashbox)
"Transfer contents of a maildrop to the specified CRASHBOX."
(or crashbox (setq crashbox (expand-file-name "~/.crashbox")))
(setq messages (cdr messages)
n (1+ n)))
(with-current-buffer crashbuf
- (write-region-as-binary (point-min) (point-max)
- crashbox 'append 'nomesg))
+ (let ((coding-system-for-write 'binary)
+ jka-compr-compression-info-list jam-zcat-filename-list)
+ (write-region (point-min) (point-max)
+ crashbox 'append 'nomesg)))
;; mark messages as read
(when pop3-leave-mail-on-server
(pop3-save-uidls))
(dolist (n retrieved-messages)
(message "Deleting message %d of %d from %s..."
n message-count pop3-mailhost)
- (pop3-dele process n)))
- )
+ (pop3-dele process n))))
(pop3-quit process))
(kill-buffer crashbuf)
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)
- )
+ (pop3-password pop3-password))
;; for debugging only
(if pop3-debug (switch-to-buffer (process-buffer process)))
;; query for password
((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 ((coding-system-for-read 'binary)
+ (coding-system-for-write 'binary))
+ (open-network-stream "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)))
+(eval-when-compile
+ (autoload 'open-ssl-stream "ssl"))
+
(defun pop3-open-ssl-stream-1 (name buffer host service extra-arg)
(require 'ssl)
(let* ((ssl-program-name
(goto-char (point-max))
(forward-line -1)
(not (looking-at "+OK")))
- (nnheader-accept-process-output process)
+ (pop3-accept-process-output process)
(sit-for 1))
(delete-region (point-min) (point)))
(and process (memq (process-status process) '(open run))
"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"))))
+ (let (selective-display ;; Disable ^M to nl translation.
+ (coding-system-for-read 'binary)
+ (coding-system-for-write 'binary))
+ (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.
Returns a subprocess-object to represent the connection.
Args are NAME BUFFER HOST SERVICE."
- (let ((process
- (as-binary-process (starttls-open-stream
- name buffer host service))))
+ (let* (selective-display ;; Disable ^M to nl translation.
+ (coding-system-for-read 'binary)
+ (coding-system-for-write 'binary)
+ (process (starttls-open-stream name buffer host service)))
(pop3-stls process)
(starttls-negotiate process)
process))
(defun pop3-send-command (process command)
(set-buffer (process-buffer process))
(goto-char (point-max))
-;; (if (= (aref command 0) ?P)
-;; (insert "PASS <omitted>\r\n")
-;; (insert command "\r\n"))
+ ;; (if (= (aref command 0) ?P)
+ ;; (insert "PASS <omitted>\r\n")
+ ;; (insert command "\r\n"))
(setq pop3-read-point (point))
(goto-char (point-max))
- (process-send-string process (concat command "\r\n"))
- )
+ (process-send-string process (concat command "\r\n")))
(defun pop3-read-response (process &optional return)
"Read the response from the server PROCESS.
(save-excursion
(set-buffer (process-buffer process))
(goto-char pop3-read-point)
- (while (not (search-forward "\r\n" nil t))
- (nnheader-accept-process-output process)
+ (while (and (memq (process-status process) '(open run))
+ (not (search-forward "\r\n" nil t)))
+ (pop3-accept-process-output process)
(goto-char pop3-read-point))
(setq match-end (point))
(goto-char pop3-read-point)
(setq pop3-read-point match-end)
(if return
(buffer-substring (point) match-end)
- t)
- )))))
+ t))))))
(defun pop3-clean-region (start end)
(setq end (set-marker (make-marker) end))
(goto-char (point-min))
(if (not (or (looking-at "From .?") ; Unix mail
(looking-at "\001\001\001\001\n") ; MMDF
- (looking-at "BABYL OPTIONS:") ; Babyl
- ))
+ (looking-at "BABYL OPTIONS:"))) ; Babyl
(let* ((from (mail-strip-quoted-names (mail-fetch-field "From")))
(tdate (mail-fetch-field "Date"))
(date (split-string (or (and tdate
;; 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)))
- ))
+ (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))
(goto-char (point-min))
(widen)
(forward-line -1)
- (insert (format "Content-Length: %s\n" size)))
- )))))
+ (insert (format "Content-Length: %s\n" size))))))))
;; UIDL support
(if (not (and response (string-match "+OK" response)))
(pop3-quit process))))
-;; When this file is being compiled in the Gnus (not T-gnus) source
-;; tree, `md5' might have been defined in w3/md5.el, ./lpath.el or one
-;; of some other libraries and `md5' will accept only 3 arguments. We
-;; will deceive the byte-compiler not to say warnings.
-(eval-and-compile
- (if (fboundp 'eval-when)
- ;; `eval-when' might not be provided when loading .el file.
- (eval-when 'compile
- (let ((def (assq 'md5 byte-compile-function-environment)))
- (if def
- (setcdr def '(lambda (object &optional start end
- coding-system noerror)))
- (setq byte-compile-function-environment
- (cons '(md5 . (lambda (object &optional start end
- coding-system noerror)))
- byte-compile-function-environment)))))))
-
-;; Note that `pop3-md5' should never encode a given string to use for
-;; the apop authentication.
-(eval-and-compile
- (if (fboundp 'md5)
- (if (condition-case nil
- (md5 "\
-Check whether the 4th argument CODING-SYSTEM is allowed"
- nil nil 'binary)
- (error nil))
- ;; Emacs 21 or XEmacs 21
- ;; (md5 OBJECT &optional START END CODING-SYSTEM NOERROR)
- (defun pop3-md5 (string)
- (md5 string nil nil 'binary))
- ;; The reason why the program reaches here:
- ;; 1. XEmacs 20 is running and the built-in `md5' doesn't
- ;; allow the 4th argument.
- ;; 2. `md5' has been defined by one of some lisp libraries.
- ;; 3. This file is being compiled in the Gnus source tree,
- ;; and `md5' has been defined in lpath.el.
- (defalias 'pop3-md5 'md5))
- ;; The lisp function will be provided by FLIM or other libraries.
- (autoload 'md5 "md5")
- (defalias 'pop3-md5 'md5)))
-
(defun pop3-apop (process user)
"Send alternate authentication information to the server."
(let ((pass pop3-password))
(setq pass
(read-passwd (format "Password for %s: " pop3-maildrop))))
(if pass
- (let ((hash (pop3-md5 (concat pop3-timestamp pass))))
+ ;; Note that `md5' should never encode a given string to use for
+ ;; the apop authentication, so we should specify `binary'.
+ (let ((hash (md5 (concat pop3-timestamp pass) nil nil 'binary)))
(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)))))
- ))
+ (pop3-quit process)))))))
(defun pop3-stls (process)
"Query whether TLS extension is supported"
(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 " "))))
- ))
+ (string-to-int (nth 2 (split-string response " "))))))
(defun pop3-retr (process msg crashbuf)
"Retrieve message-id MSG to buffer CRASHBUF."
(let ((region (pop3-get-extended-response process)))
(pop3-munge-message-separator (car region) (cadr region))
(append-to-buffer crashbuf (car region) (cadr region))
- (delete-region (car region) (cadr region))
- )))
+ (delete-region (car region) (cadr region)))))
(defun pop3-dele (process msg)
"Mark message-id MSG as deleted."
"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)
"Remove all delete marks from current maildrop."
uidl (match-string 2))
(push (cons msgno uidl) pairs)
(beginning-of-line 2))
- (cons (length pairs) (nreverse pairs))
- )))))
+ (cons (length pairs) (nreverse pairs)))))))
(defun pop3-list (process &optional msgno)
"Return the results of a LIST command for PROCESS and optional MSGNO.
len (string-to-int (match-string 2)))
(push (cons msgno len) pairs)
(beginning-of-line 2))
- (cons (length pairs) (nreverse pairs))
- )))))
+ (cons (length pairs) (nreverse pairs)))))))
(defun pop3-top (process msgno &optional lines)
"Return the top LINES of messages for PROCESS and MSGNO.
(if (pop3-read-response process t)
nil ;; MSGNO is not valid number
(save-excursion
- (apply 'buffer-substring (pop3-get-extended-response process)))
- ))
+ (apply 'buffer-substring (pop3-get-extended-response process)))))
;;; Utility code
(set-buffer (process-buffer process))
(goto-char start)
(while (not (re-search-forward "^\\.\r\n" nil t))
- (nnheader-accept-process-output process)
+ (pop3-accept-process-output process)
(goto-char start))
(setq pop3-read-point (point-marker))
(goto-char (match-beginning 0))
(pop3-clean-region start end)
(list start end)))
+;;; Advise the mail-source function in order to use this module in Gnus.
+
+(eval-after-load "mail-source"
+ '(if (member '(:connection)
+ (assq 'pop (symbol-value 'mail-source-keyword-map)))
+ nil ;; T-gnus is running.
+ (defadvice mail-source-fetch-pop (around bind-t-gnus-keywords activate)
+ "Bind `pop3-connection-type' and `pop3-leave-mail-on-server' according
+to `mail-sources' while fetching mails with Gnus."
+ (let ((pop3-connection-type (or (plist-get (cdr (ad-get-arg 0))
+ :connection)
+ pop3-connection-type))
+ (pop3-leave-mail-on-server (or (plist-get (cdr (ad-get-arg 0))
+ :leave)
+ pop3-leave-mail-on-server)))
+ ad-do-it))))
+
\f
;; Summary of POP3 (Post Office Protocol version 3) commands and responses