xemacs-beta: lisp/gnus/nntp.el comparison

comparison lisp/gnus/nntp.el @ 2:ac2d302a0011 r19-15b2

Import from CVS: tag r19-15b2

author	cvs
date	Mon, 13 Aug 2007 08:46:35 +0200
parents	376386a54a3c
children	0293115a14e9

comparison

equal deleted inserted replaced

-:c0c6a60d29db
+:ac2d302a0011
 system (see nntp-port-number).  The other is `nntp-open-rlogin', which
 does an rlogin on the remote system, and then does a telnet to the
 NNTP server available there (see nntp-rlogin-parameters).")
 (defvoo nntp-rlogin-parameters '("telnet" "${NNTPSERVER:=localhost}" "nntp")
-"*Parameters to `nntp-open-login'.
+"*Parameters to `nntp-open-rlogin'.
 That function may be used as `nntp-open-server-function'.  In that
 case, this list will be used as the parameter list given to rsh.")
 (defvoo nntp-rlogin-user-name nil
 "*User name on remote system when using the rlogin connect method.")
+(defvoo nntp-telnet-parameters '("exec" "telnet" "-8" "${NNTPSERVER:=localhost}" "nntp")
+"*Parameters to `nntp-open-telnet'.
+That function may be used as `nntp-open-server-function'.  In that
+case, this list will be executed as a command after logging in
+via telnet.")
+(defvoo nntp-telnet-user-name nil
+"User name to log in via telnet with.")
+(defvoo nntp-telnet-passwd nil
+"Password to use to log in via telnet with.")
 (defvoo nntp-address nil
 "*The name of the NNTP server.")
 (defvoo nntp-port-number "nntp"
 "*Port number to connect to.")
 (defvoo nntp-end-of-line "\r\n"
 "String to use on the end of lines when talking to the NNTP server.
 This is \"\\r\\n\" by default, but should be \"\\n\" when
-using rlogin to communicate with the server.")
+using rlogin or telnet to communicate with the server.")
 (defvoo nntp-large-newsgroup 50
 "*The number of the articles which indicates a large newsgroup.
 If the number of the articles is greater than the value, verbose
 messages will be shown to indicate the current status.")
 (deffoo nntp-open-server (server &optional defs connectionless)
 "Open the virtual server SERVER.
 If CONNECTIONLESS is non-nil, don't attempt to connect to any physical
 servers."
+(nnheader-init-server-buffer)
 ;; Called with just a port number as the defs.
 (when (or (stringp (car defs))
 	    (numberp (car defs)))
 (setq defs `((nntp-port-number ,(car defs)))))
 (unless (assq 'nntp-address defs)
 (while (setq entry (pop alist))
 	(and (setq proc (cdr (assq 'nntp-async-buffer entry)))
 	     (buffer-name proc)
 	     (kill-buffer proc))))
 (nnoo-close-server 'nntp)
-(setq nntp-async-group-alist nil)))
+(setq nntp-async-group-alist nil
+	  nntp-async-articles nil)))
 (deffoo nntp-server-opened (&optional server)
 "Say whether a connection to SERVER has been opened."
 (and (nnoo-current-server-p 'nntp server)
 nntp-server-buffer
 1. Insert `.' at beginning of line.
 2. Insert `.' at end of buffer (end of text mark)."
 (save-excursion
 ;; Replace `.' at beginning of line with `..'.
 (goto-char (point-min))
-(while (search-forward "\n." nil t)
+(while (re-search-forward "^\\." nil t)
 (insert "."))
 (goto-char (point-max))
 ;; Insert newline at end of buffer.
 (or (bolp) (insert "\n"))
+;(goto-char (point-min))
+;(while (not (eobp))
+;  (end-of-line)
+;  (insert "\r")
+;  (forward-line 1))
 ;; Insert `.' at end of buffer (end of text mark).
+(goto-char (point-max))
 (insert "." nntp-end-of-line)))
 ;;;
 ;;; Synchronous Communication with NNTP servers.
 ;;;
 	  ;; Every 400 requests we have to read the stream in
 	  ;; order to avoid deadlocks.
 	  (when (or (null articles)	;All requests have been sent.
 		    (zerop (% count nntp-maximum-request)))
-	    (accept-process-output)
+	    (accept-process-output nntp-server-process 1)
 	    ;; On some Emacs versions the preceding function has
 	    ;; a tendency to change the buffer. Perhaps. It's
 	    ;; quite difficult to reproduce, because it only
 	    ;; seems to happen once in a blue moon.
 	    (set-buffer buf)
 		     ;; Count replies.
 		     (while (re-search-forward "^[0-9][0-9][0-9] " nil t)
 		       (setq received (1+ received)))
 		     (setq last-point (point))
 		     (< received count))
-	      (accept-process-output)
+	      (accept-process-output nntp-server-process)
 	      (set-buffer buf)))))
 (when nntp-server-xover
 	;; Wait for the reply from the final command.
 	(goto-char (point-max))
 "Send STRINGS to the server."
 (let ((cmd (concat (mapconcat 'identity strings " ") nntp-end-of-line)))
 ;; We open the nntp server if it is down.
 (or (nntp-server-opened (nnoo-current-server 'nntp))
 	(nntp-open-server (nnoo-current-server 'nntp))
-	(error (nntp-status-message)))
+	(error "Couldn't open server: " (nntp-status-message)))
 ;; Send the strings.
 (process-send-string nntp-server-process cmd)
 t))
 (defun nntp-send-region-to-server (begin end)
 (kill-buffer (current-buffer)))))
 (defun nntp-open-server-semi-internal (server &optional service)
 "Open SERVER.
 If SERVER is nil, use value of environment variable `NNTPSERVER'.
-If SERVICE, this this as the port number."
+If SERVICE, use this as the port number."
 (nnheader-insert "")
 (let ((server (or server (getenv "NNTPSERVER")))
 	(status nil)
 	(timer
 	 (and nntp-connection-timeout
 	     (setq nntp-address server)
 	     (setq status
 		   (condition-case nil
 		       (nntp-wait-for-response "^[23].*\r?\n" 'slow)
 		     (error nil)
-		     (quit nil)))
+		     ;(quit nil)
+		     ))
 	     (unless status
 	       (nntp-close-server-internal server)
 	       (nnheader-report
 		'nntp "Couldn't open connection to %s"
 		(if (and nntp-address
 	       ;; Added by Hallvard B Furuseth <h.b.furuseth@usit.uio.no>
 	       (run-hooks 'nntp-server-opened-hook)))
 	    ((null server)
 	     (nnheader-report 'nntp "NNTP server is not specified."))
 	    (t				; We couldn't open the server.
-	     (nnheader-report
+	     (nnheader-report 'nntp (buffer-string))))
-	      'nntp (buffer-substring (point-min) (point-max)))))
 (when timer
 	(nnheader-cancel-timer timer))
 (message "")
 (unless status
 	(nnoo-close-server 'nntp server)
 (defun nntp-open-network-stream (server)
 (open-network-stream
 "nntpd" nntp-server-buffer server nntp-port-number))
 (defun nntp-open-rlogin (server)
+"Open a connection to SERVER using rsh."
 (let ((proc (if nntp-rlogin-user-name
 		  (start-process
 		   "nntpd" nntp-server-buffer "rsh"
-		   "-l" nntp-rlogin-user-name server
+		   server "-l" nntp-rlogin-user-name
 		   (mapconcat 'identity
 			      nntp-rlogin-parameters " "))
 		(start-process
 		 "nntpd" nntp-server-buffer "rsh" server
 		 (mapconcat 'identity
 			    nntp-rlogin-parameters " ")))))
 proc))
-(defun nntp-telnet-to-machine ()
+(defun nntp-wait-for-string (regexp)
-(let (b)
+"Wait until string arrives in the buffer."
-(telnet "localhost")
+(let ((buf (current-buffer)))
 (goto-char (point-min))
-(while (not (re-search-forward "^login: *" nil t))
+(while (not (re-search-forward regexp nil t))
-(sit-for 1)
+(accept-process-output nntp-server-process)
-(goto-char (point-min)))
+(set-buffer buf)
-(goto-char (point-max))
+(goto-char (point-min)))))
-(insert "larsi")
-(telnet-send-input)
+(defun nntp-open-telnet (server)
-(setq b (point))
+(save-excursion
-(while (not (re-search-forward ">" nil t))
+(set-buffer nntp-server-buffer)
-(sit-for 1)
+(erase-buffer)
-(goto-char b))
+(let ((proc (start-process
-(goto-char (point-max))
+		 "nntpd" nntp-server-buffer "telnet" "-8"))
-(insert "ls")
+	  (case-fold-search t))
-(telnet-send-input)))
+(when (memq (process-status proc) '(open run))
+	(process-send-string proc "set escape \^X\n")
+	(process-send-string proc (concat "open " server "\n"))
+	(nntp-wait-for-string "^\r*.?login:")
+	(process-send-string
+	 proc (concat
+	       (or nntp-telnet-user-name
+		   (setq nntp-telnet-user-name (read-string "login: ")))
+	       "\n"))
+	(nntp-wait-for-string "^\r*.?password:")
+	(process-send-string
+	 proc (concat
+	       (or nntp-telnet-passwd
+		   (setq nntp-telnet-passwd
+			 (nnmail-read-passwd "Password: ")))
+	       "\n"))
+	(erase-buffer)
+	(nntp-wait-for-string "bash\\|\$ *\r?$\\|> *\r?")
+	(process-send-string
+	 proc (concat (mapconcat 'identity nntp-telnet-parameters " ") "\n"))
+	(nntp-wait-for-string "^\r*200")
+	(beginning-of-line)
+	(delete-region (point-min) (point))
+	(process-send-string proc "\^]")
+	(nntp-wait-for-string "^telnet")
+	(process-send-string proc "mode character\n")
+	(accept-process-output proc 1)
+	(sit-for 1)
+	(goto-char (point-min))
+	(forward-line 1)
+	(delete-region (point) (point-max)))
+proc)))
 (defun nntp-close-server-internal (&optional server)
 "Close connection to news server."
 (nntp-possibly-change-server nil server)
 (if nntp-server-process
 (delete-process nntp-server-process))
 (setq nntp-server-process nil)
-(setq nntp-address ""))
+;(setq nntp-address "")
+)
 (defun nntp-accept-response ()
 "Read response of server.
 It is well-known that the communication speed will be much improved by
 defining this function as macro."

Mercurial > hg > xemacs-beta

comparison lisp/gnus/nntp.el @ 2:ac2d302a0011 r19-15b2