* pop3.el (pop3-last): Use `split-string' instead of `pop3-string-to-list'.

[elisp/gnus.git-] / lisp / pop3.el

diff --git a/lisp/pop3.el b/lisp/pop3.el
index 750c2b6..e6d3f42 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.3h
+;; Version: 1.3m+
 
 ;; This file is part of GNU Emacs.
 
@@ -37,9 +37,9 @@
 (require 'mail-utils)
 (provide 'pop3)
 
-(defconst pop3-version "1.3h")
+(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.")
@@ -91,7 +91,7 @@ Used for APOP authentication.")
       (pop3-retr process n crashbuf)
       (save-excursion
        (set-buffer crashbuf)
-       (append-to-file (point-min) (point-max) crashbox)
+       (write-region-as-binary (point-min) (point-max) crashbox 'append)
        (set-buffer (process-buffer process))
        (while (> (buffer-size) 5000)
          (goto-char (point-min))
@@ -114,16 +114,16 @@ Returns the process associated with the connection."
        (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))
+         (open-network-stream-as-binary "POP" process-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
-    ))
+    process))
 
 ;; Support functions
 
@@ -168,29 +168,15 @@ Return the response string if optional second argument is non-nil."
            t)
          )))))
 
-(defun pop3-string-to-list (string &optional regexp)
-  "Chop up a string into a list."
-  (let ((list)
-       (regexp (or regexp " "))
-       (string (if (string-match "\r" string)
-                   (substring string 0 (match-beginning 0))
-                 string)))
-    (store-match-data nil)
-    (while string
-      (if (string-match regexp string)
-         (setq list (cons (substring string 0 (- (match-end 0) 1)) list)
-               string (substring string (match-end 0)))
-       (setq list (cons string list)
-             string nil)))
-    (nreverse list)))
-
 (defvar pop3-read-passwd nil)
 (defun pop3-read-passwd (prompt)
   (if (not pop3-read-passwd)
-      (if (load "passwd" t)
+      (if (functionp 'read-passwd)
          (setq pop3-read-passwd 'read-passwd)
-       (autoload 'ange-ftp-read-passwd "ange-ftp")
-       (setq pop3-read-passwd 'ange-ftp-read-passwd)))
+       (if (load "passwd" t)
+           (setq pop3-read-passwd 'read-passwd)
+         (autoload 'ange-ftp-read-passwd "ange-ftp")
+         (setq pop3-read-passwd 'ange-ftp-read-passwd))))
   (funcall pop3-read-passwd prompt))
 
 (defun pop3-clean-region (start end)
@@ -217,8 +203,8 @@ Return the response string if optional second argument is non-nil."
                   (looking-at "BABYL OPTIONS:") ; Babyl
                   ))
          (let ((from (mail-strip-quoted-names (mail-fetch-field "From")))
-               (date (pop3-string-to-list (or (mail-fetch-field "Date")
-                                              (message-make-date))))
+               (date (split-string (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)
@@ -277,8 +263,8 @@ Return the response string if optional second argument is non-nil."
   "Return the number of messages in the maildrop and the maildrop's size."
   (pop3-send-command process "STAT")
   (let ((response (pop3-read-response process t)))
-    (list (string-to-int (nth 1 (pop3-string-to-list response)))
-         (string-to-int (nth 2 (pop3-string-to-list response))))
+    (list (string-to-int (nth 1 (split-string response)))
+         (string-to-int (nth 2 (split-string response))))
     ))
 
 (defun pop3-list (process &optional msg)
@@ -295,12 +281,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...
@@ -335,7 +326,7 @@ This function currently does nothing.")
   "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 (pop3-string-to-list response)))
+    (string-to-int (nth 1 (split-string response)))
     ))
 
 (defun pop3-rset (process)