;;; pop3.el --- Post Office Protocol (RFC 1460) interface
-;; Copyright (C) 1996, Free Software Foundation, Inc.
+;; Copyright (C) 1996,1997 Free Software Foundation, Inc.
;; Author: Richard L. Pieri <ratinox@peorth.gweep.net>
;; Keywords: mail, pop3
-;; Version: 1.3e
+;; Version: 1.3k
;; This file is part of GNU Emacs.
(require 'mail-utils)
(provide 'pop3)
-(defconst pop3-version "1.3c")
+(defconst pop3-version "1.3k")
(defvar pop3-maildrop (or user-login-name (getenv "LOGNAME") (getenv "USER") nil)
"*POP3 maildrop.")
(let* ((process (pop3-open-server pop3-mailhost pop3-port))
(crashbuf (get-buffer-create " *pop3-retr*"))
(n 1)
- message-count)
+ 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")))
+ (t (error "Invalid POP3 authentication scheme.")))
(setq message-count (car (pop3-stat process)))
(while (<= n message-count)
(message (format "Retrieving message %d of %d from %s..."
(process))
(save-excursion
(set-buffer process-buffer)
- (erase-buffer))
+ (erase-buffer)
+ (setq pop3-read-point (point-min))
+ )
(setq process
(open-network-stream "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)
(defun pop3-munge-message-separator (start end)
"Check to see if a message separator exists. If not, generate one."
+ (if (not (fboundp 'message-make-date)) (autoload 'message-make-date "message"))
(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 (pop3-string-to-list (mail-fetch-field "Date")))
+ (date (pop3-string-to-list (or (mail-fetch-field "Date")
+ (message-make-date))))
(From_))
;; sample date formats I have seen
;; Date: Tue, 9 Jul 1996 09:04:21 -0400 (EDT)
(defun pop3-pass (process)
"Send authentication information to the server."
- (let ((pass pop3-password))
- (if (and pop3-password-required (not pass))
- (setq pass
- (pop3-read-passwd (format "Password for %s: " pop3-maildrop))))
- (if pass
- (progn
- (pop3-send-command process (format "PASS %s" pass))
- (let ((response (pop3-read-response process t)))
- (if (not (and response (string-match "+OK" response)))
- (pop3-quit process)))))
- ))
+ (pop3-send-command process (format "PASS %s" pop3-password))
+ (let ((response (pop3-read-response process t)))
+ (if (not (and response (string-match "+OK" response)))
+ (pop3-quit process))))
(defun pop3-apop (process user)
"Send alternate authentication information to the server."
(if (not (fboundp 'md5)) (autoload 'md5 "md5"))
- (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 (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)))))
- ))
+ (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)))))
;; TRANSACTION STATE
(while (not (re-search-forward "^\\.\r\n" nil t))
(accept-process-output process 3)
;; bill@att.com ... to save wear and tear on the heap
+ ;; uncommented because the condensed version below is a problem for
+ ;; some.
(if (> (buffer-size) 20000) (sleep-for 1))
(if (> (buffer-size) 50000) (sleep-for 1))
(if (> (buffer-size) 100000) (sleep-for 1))
(if (> (buffer-size) 200000) (sleep-for 1))
(if (> (buffer-size) 500000) (sleep-for 1))
;; bill@att.com
+ ;; condensed into:
+ ;; (sometimes causes problems for really large messages.)
+; (if (> (buffer-size) 20000) (sleep-for (/ (buffer-size) 20000)))
(goto-char start))
(setq pop3-read-point (point-marker))
;; this code does not seem to work for some POP servers...