;;; pop3.el --- Post Office Protocol (RFC 1460) interface
-;; Copyright (C) 1996,1997 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999 Free Software Foundation, Inc.
;; Author: Richard L. Pieri <ratinox@peorth.gweep.net>
;; Keywords: mail, pop3
-;; Version: 1.3j
+;; Version: 1.3s
;; This file is part of GNU Emacs.
(require 'mail-utils)
(provide 'pop3)
-(defconst pop3-version "1.3j")
+(defconst pop3-version "1.3s")
-(defvar pop3-maildrop (or user-login-name (getenv "LOGNAME") (getenv "USER") nil)
+(defvar pop3-maildrop (or (user-login-name) (getenv "LOGNAME") (getenv "USER") nil)
"*POP3 maildrop.")
(defvar pop3-mailhost (or (getenv "MAILHOST") nil)
"*POP3 mailhost.")
(pop3-pass process))
(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..."
- n message-count pop3-mailhost))
- (pop3-retr process n crashbuf)
- (save-excursion
- (set-buffer crashbuf)
- (append-to-file (point-min) (point-max) crashbox)
- (set-buffer (process-buffer process))
- (while (> (buffer-size) 5000)
- (goto-char (point-min))
- (forward-line 50)
- (delete-region (point-min) (point))))
- (pop3-dele process n)
- (setq n (+ 1 n))
- (if pop3-debug (sit-for 1) (sit-for 0.1))
- )
- (pop3-quit process)
+ (unwind-protect
+ (while (<= n message-count)
+ (message (format "Retrieving message %d of %d from %s..."
+ n message-count pop3-mailhost))
+ (pop3-retr process n crashbuf)
+ (save-excursion
+ (set-buffer crashbuf)
+ (write-region (point-min) (point-max) crashbox t 'nomesg)
+ (set-buffer (process-buffer process))
+ (while (> (buffer-size) 5000)
+ (goto-char (point-min))
+ (forward-line 50)
+ (delete-region (point-min) (point))))
+ (pop3-dele process n)
+ (setq n (+ 1 n))
+ (if pop3-debug (sit-for 1) (sit-for 0.1))
+ )
+ (pop3-quit process))
(kill-buffer crashbuf)
)
- )
+ t)
(defun pop3-open-server (mailhost port)
"Open TCP connection to MAILHOST.
Returns the process associated with the connection."
(let ((process-buffer
(get-buffer-create (format "trace of POP session to %s" mailhost)))
- (process))
+ (process)
+ (coding-system-for-read 'binary) ;; because FSF Emacs 20 and
+ (coding-system-for-write 'binary) ;; XEmacs 20 & 21 are st00pid
+ )
(save-excursion
(set-buffer process-buffer)
(erase-buffer)
;; (insert command "\r\n"))
(setq pop3-read-point (point))
(goto-char (point-max))
- (process-send-string process command)
- (process-send-string process "\r\n")
+ (process-send-string process (concat command "\r\n"))
)
(defun pop3-read-response (process &optional return)
(setq match-end (point))
(goto-char pop3-read-point)
(if (looking-at "-ERR")
- (error (buffer-substring (point) (- match-end 2)))
+ (signal 'error (list (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)
(setq From_ (concat (substring From_ 0 (match-beginning 0))
(substring From_ (match-end 0)))))
(goto-char (point-min))
- (insert From_))))))
+ (insert From_)
+ (re-search-forward "\n\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)))
+ )))))
;; The Command Set
(set-buffer (process-buffer process))
(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
-; (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
+ ;; 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:
- (if (> (buffer-size) 20000) (sleep-for (/ (buffer-size) 20000)))
+ ;; (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...