(require 'elmo-msgdb)
(require 'elmo-net)
-(require 'sasl)
(eval-when-compile
- (require 'elmo-util)
- (defun-maybe md5 (a)))
+ (require 'elmo-util))
(eval-and-compile
- (autoload 'starttls-open-stream "starttls")
- (autoload 'starttls-negotiate "starttls"))
-
-(defvar elmo-pop3-use-uidl t
- "*If non-nil, use UIDL.")
+ (autoload 'md5 "md5"))
(defvar elmo-pop3-exists-exactly t)
+(defvar sasl-mechanism-alist)
-(eval-and-compile
- (luna-define-class elmo-pop3-session (elmo-network-session) ()))
+(defvar elmo-pop3-total-size nil)
+
+;; For debugging.
+(defvar elmo-pop3-debug nil
+ "Non-nil forces POP3 folder as debug mode.
+Debug information is inserted in the buffer \"*POP3 DEBUG*\"")
+
+(defvar elmo-pop3-debug-inhibit-logging nil)
+
+;;; Debug
+(defsubst elmo-pop3-debug (message &rest args)
+ (if elmo-pop3-debug
+ (with-current-buffer (get-buffer-create "*POP3 DEBUG*")
+ (goto-char (point-max))
+ (if elmo-pop3-debug-inhibit-logging
+ (insert "NO LOGGING\n")
+ (insert (apply 'format message args) "\n")))))
+
+(luna-define-class elmo-pop3-session (elmo-network-session))
;; buffer-local
(defvar elmo-pop3-read-point nil)
(erase-buffer))
(goto-char (point-min))
(setq elmo-pop3-read-point (point))
+ (elmo-pop3-debug "SEND: %s\n" command)
(process-send-string process command)
(process-send-string process "\r\n")))
(save-excursion
(set-buffer (process-buffer process))
(goto-char (point-max))
- (insert output)))
+ (insert output)
+ (elmo-pop3-debug "RECEIVED: %s\n" output)
+ (if elmo-pop3-total-size
+ (message "Retrieving...(%d/%d bytes)."
+ (buffer-size) elmo-pop3-total-size))))
(defun elmo-pop3-auth-user (session)
(let ((process (elmo-network-session-process-internal session)))
(elmo-network-session-greeting-internal session))
;; good, APOP ready server
(progn
- (require 'md5)
(elmo-pop3-send-command
(elmo-network-session-process-internal session)
(format "apop %s %s"
t)
(signal 'elmo-authenticate-error
'(elmo-pop3-auth-apop))))
- (signal 'elmo-open-error '(elmo-pop-auth-apop))))
-
+ (signal 'elmo-open-error '(elmo-pop3-auth-apop))))
+
(luna-define-method elmo-network-initialize-session-buffer :after
((session elmo-pop3-session) buffer)
(with-current-buffer buffer
(with-current-buffer (process-buffer
(elmo-network-session-process-internal session))
(let* ((process (elmo-network-session-process-internal session))
+ (elmo-pop3-debug-inhibit-logging t)
(auth (elmo-network-session-auth-internal session))
(auth (mapcar '(lambda (mechanism) (upcase (symbol-name mechanism)))
(if (listp auth) auth (list auth))))
+ sasl-mechanisms
client name step response mechanism
sasl-read-passphrase)
(or (and (string= "USER" (car auth))
(and (string= "APOP" (car auth))
(elmo-pop3-auth-apop session))
(progn
+ (require 'sasl)
+ (setq sasl-mechanisms (mapcar 'car sasl-mechanism-alist))
(setq mechanism (sasl-find-mechanism auth))
(unless mechanism
(signal 'elmo-authenticate-error '(elmo-pop3-auth-no-mechanisms)))
process
(concat "AUTH " name
(and (sasl-step-data step)
- (concat
+ (concat
" "
(elmo-base64-encode-string
(sasl-step-data step) 'no-line-break))))) ;)
(catch 'done
(while t
(unless (setq response (elmo-pop3-read-response process t))
+ ;; response is NO or BAD.
(signal 'elmo-authenticate-error
(list (intern
(concat "elmo-pop3-auth-"
(downcase name))))))
(if (string-match "^\+OK" response)
(if (sasl-next-step client step)
+ ;; Bogus server?
(signal 'elmo-authenticate-error
(list (intern
(concat "elmo-pop3-auth-"
(downcase name)))))
+ ;; The authentication process is finished.
(throw 'done nil)))
(sasl-step-set-data
step
(elmo-pop3-parse-uidl-response response)))))
(defun elmo-pop3-read-contents (buffer process)
- (save-excursion
- (set-buffer buffer)
+ (with-current-buffer buffer
(let ((case-fold-search nil)
match-end)
(goto-char elmo-pop3-read-point)
(let (number uid list)
(insert string)
(goto-char (point-min))
- (while (re-search-forward "^\\([0-9]+\\)[\t ]\\([^ \n]+\\)$" nil t)
+ (while (re-search-forward "^\\([0-9]+\\)[\t ]+\\([^ \n]+\\)$" nil t)
(setq number (elmo-match-buffer 1))
(setq uid (elmo-match-buffer 2))
(with-current-buffer buffer
(with-temp-buffer
(insert string)
(goto-char (point-min))
- (while (re-search-forward "^\\([0-9]+\\)[\t ]\\([0-9]+\\)$" nil t)
+ (while (re-search-forward "^\\([0-9]+\\)[\t ]+\\([0-9]+\\)$" nil t)
(setq alist
(cons
(cons (elmo-match-buffer 1)
(sort list '<))
(error "POP3: Error in list")))))
-(defun elmo-pop3-list-folder (spec)
+(defun elmo-pop3-list-folder (spec &optional nohide)
(let ((killed (and elmo-use-killed-list
(elmo-msgdb-killed-list-load
(elmo-msgdb-expand-path spec))))
(defun elmo-pop3-max-of-folder (spec)
(elmo-pop3-commit spec)
(if elmo-pop3-use-uidl
- (elmo-pop3-list-by-uidl-subr spec 'nonsort)
+ (prog1
+ (elmo-pop3-list-by-uidl-subr spec 'nonsort)
+ (elmo-pop3-commit spec))
(let* ((process
(elmo-network-session-process-internal
(elmo-pop3-get-session spec)))
(setq total
(string-to-int
(substring response (match-beginning 1)(match-end 1 ))))
+ (elmo-pop3-commit spec)
(cons total total))))))
(defvar elmo-pop3-header-fetch-chop-length 200)
nil))
(t
nil)))
-
+
(defun elmo-pop3-retrieve-headers (buffer tobuffer process articles)
(save-excursion
(set-buffer buffer)
(defalias 'elmo-pop3-msgdb-create 'elmo-pop3-msgdb-create-as-numlist)
+(defun elmo-pop3-sort-overview-by-original-number (overview loc-alist)
+ (if loc-alist
+ (sort overview
+ (lambda (ent1 ent2)
+ (< (elmo-pop3-uidl-to-number
+ (cdr (assq (elmo-msgdb-overview-entity-get-number ent1)
+ loc-alist)))
+ (elmo-pop3-uidl-to-number
+ (cdr (assq (elmo-msgdb-overview-entity-get-number ent2)
+ loc-alist))))))
+ overview))
+
+(defun elmo-pop3-sort-msgdb-by-original-number (msgdb)
+ (message "Sorting...")
+ (let ((overview (elmo-msgdb-get-overview msgdb)))
+ (setq overview (elmo-pop3-sort-overview-by-original-number
+ overview
+ (elmo-msgdb-get-location msgdb)))
+ (message "Sorting...done")
+ (list overview (nth 1 msgdb)(nth 2 msgdb)(nth 3 msgdb)(nth 4 msgdb))))
+
(defun elmo-pop3-msgdb-create-as-numlist (spec numlist new-mark
already-mark seen-mark
important-mark seen-list
(setq loc-alist (if msgdb (elmo-msgdb-get-location msgdb)
(elmo-msgdb-location-load
(elmo-msgdb-expand-path spec)))))
- (elmo-pop3-msgdb-create-by-header process numlist
- new-mark already-mark
- seen-mark seen-list
- loc-alist))))
+ (with-current-buffer (process-buffer process)
+ (elmo-pop3-sort-msgdb-by-original-number
+ (elmo-pop3-msgdb-create-by-header process numlist
+ new-mark already-mark
+ seen-mark seen-list
+ loc-alist))))))
(defun elmo-pop3-uidl-to-number (uidl)
(string-to-number (elmo-get-hash-val uidl
(insert-buffer-substring (process-buffer process) start (- end 3))
(elmo-delete-cr-get-content-type)))))
-(defun elmo-pop3-read-msg (spec number outbuf &optional msgdb)
+(defun elmo-pop3-read-msg (spec number outbuf &optional msgdb unread)
(let* ((loc-alist (if elmo-pop3-use-uidl
(if msgdb
(elmo-msgdb-get-location msgdb)
(elmo-msgdb-expand-path spec)))))
(process (elmo-network-session-process-internal
(elmo-pop3-get-session spec)))
- response errmsg msg)
+ size response errmsg msg)
(with-current-buffer (process-buffer process)
(if loc-alist
(setq number (elmo-pop3-uidl-to-number
(cdr (assq number loc-alist)))))
+ (setq size (string-to-number
+ (elmo-pop3-number-to-size number)))
(when number
(elmo-pop3-send-command process
(format "retr %s" number))
- (when (null (setq response (elmo-pop3-read-response
- process t)))
- (error "Fetching message failed"))
- (setq response (elmo-pop3-read-body process outbuf))
+ (setq elmo-pop3-total-size size)
+ (unless elmo-inhibit-display-retrieval-progress
+ (setq elmo-pop3-total-size size)
+ (elmo-display-progress
+ 'elmo-pop3-display-retrieval-progress
+ (format "Retrieving (0/%d bytes)..." elmo-pop3-total-size)
+ 0))
+ (unwind-protect
+ (progn
+ (when (null (setq response (elmo-pop3-read-response
+ process t)))
+ (error "Fetching message failed"))
+ (setq response (elmo-pop3-read-body process outbuf)))
+ (setq elmo-pop3-total-size nil))
+ (unless elmo-inhibit-display-retrieval-progress
+ (elmo-display-progress
+ 'elmo-display-retrieval-progress "" 100) ; remove progress bar.
+ (message "Retrieving...done."))
(set-buffer outbuf)
(goto-char (point-min))
(while (re-search-forward "^\\." nil t)
(defun elmo-pop3-commit (spec)
(if (elmo-pop3-plugged-p spec)
(let ((session (elmo-pop3-get-session spec 'if-exists)))
- (and session
- (elmo-network-close-session session)))))
-
+ (when session
+ (elmo-network-close-session session)))))
(require 'product)
(product-provide (provide 'elmo-pop3) (require 'elmo-version))
projects / elisp / wanderlust.git / blobdiff