*** empty log message ***

[gnus] / lisp / pop3.el

diff --git a/lisp/pop3.el b/lisp/pop3.el
index f28ef17..8a47fb3 100644 (file)
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -1,10 +1,10 @@
 ;;; pop3.el --- Post Office Protocol (RFC 1460) interface
 
-;; Copyright (C) 1996,1997 Free Software Foundation, Inc.
+;; Copyright (C) 1996,1997,1998 Free Software Foundation, Inc.
 
 ;; Author: Richard L. Pieri <ratinox@peorth.gweep.net>
 ;; Keywords: mail, pop3
-;; Version: 1.3g
+;; Version: 1.3m
 
 ;; This file is part of GNU Emacs.
 
@@ -37,9 +37,9 @@
 (require 'mail-utils)
 (provide 'pop3)
 
-(defconst pop3-version "1.3g")
+(defconst pop3-version "1.3m")
 
-(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.")
@@ -69,9 +69,15 @@ Used for APOP authentication.")
   (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)
@@ -105,13 +111,17 @@ Used for APOP authentication.")
 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/1 are st00pid 
+    )
     (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)
@@ -153,7 +163,7 @@ Return the response string if optional second argument is non-nil."
       (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)
@@ -251,32 +261,19 @@ Return the response string if optional second argument is non-nil."
 
 (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
 
@@ -302,12 +299,17 @@ This function currently does nothing.")
       (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...