* elmo-nntp.el (elmo-network-initialize-session): Skip garbage output

        before greeting.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 9ac841f..032909e 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-22  Kenichi OKADA  <okada@opaopa.org>
+
+       * elmo-nntp.el (elmo-network-initialize-session): Skip garbage output
+       before greeting.
+
 2000-11-22  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * elmo-version.el (elmo-version): Up to 2.5.3.

diff --git a/elmo/elmo-nntp.el b/elmo/elmo-nntp.el
index 20ad2eb..4d2afa0 100644 (file)
--- a/elmo/elmo-nntp.el
+++ b/elmo/elmo-nntp.el
@@ -181,21 +181,28 @@ Don't cache if nil.")
 
 (luna-define-method elmo-network-initialize-session ((session
                                                      elmo-nntp-session))
-  (set-process-filter (elmo-network-session-process-internal session)
-                     'elmo-nntp-process-filter)
-  (with-current-buffer (elmo-network-session-buffer session)
-    (setq elmo-nntp-read-point (point-min))
-    (or (elmo-nntp-read-response session t)
-       (error "Cannot open network"))
-    (when (eq (elmo-network-stream-type-symbol
-              (elmo-network-session-stream-type-internal session))
-             'starttls)
-      (elmo-nntp-send-command session "starttls")
-      (or (elmo-nntp-read-response session)
-         (error "Cannot open starttls session"))
-      (starttls-negotiate
-       (elmo-network-session-process-internal session)))))
-
+  (let ((process (elmo-network-session-process-internal session)))
+    (set-process-filter (elmo-network-session-process-internal session)
+                       'elmo-nntp-process-filter)
+    (with-current-buffer (elmo-network-session-buffer session)
+      (setq elmo-nntp-read-point (point-min))
+      ;; Skip garbage output from process before greeting.
+      (while (and (memq (process-status process) '(open run))
+                  (goto-char (point-max))
+                  (forward-line -1)
+                  (not (looking-at "200")))
+        (accept-process-output process 1))
+      (setq elmo-nntp-read-point (point))
+      (or (elmo-nntp-read-response session t)
+         (error "Cannot open network"))
+      (when (eq (elmo-network-stream-type-symbol
+                (elmo-network-session-stream-type-internal session))
+               'starttls)
+       (elmo-nntp-send-command session "starttls")
+       (or (elmo-nntp-read-response session)
+           (error "Cannot open starttls session"))
+       (starttls-negotiate
+        (elmo-network-session-process-internal session))))))
 
 (luna-define-method elmo-network-authenticate-session ((session
                                                        elmo-nntp-session))