xemacs-beta: lisp/efs/efs.el comparison

comparison lisp/efs/efs.el @ 138:6608ceec7cf8 r20-2b3

Import from CVS: tag r20-2b3

author	cvs
date	Mon, 13 Aug 2007 09:31:46 +0200
parents	7d55a9ba150c
children	169c0442b401

comparison

equal deleted inserted replaced

-:cae984061f40
+:6608ceec7cf8
 ;;;
 ;;;    LCD Archive Entry:
 ;;;    efs|Andy Norman and Sandy Rutherford
 ;;;    |ange@hplb.hpl.hp.com and sandy@ibm550.sissa.it
 ;;;    |transparent FTP Support for GNU Emacs
-;;;    |$Date: 1997/04/05 18:07:24 $|$efs release: 1.15 beta $|
+;;;    |$Date: 1997/04/27 19:30:06 $|$efs release: 1.15 beta $|
 ;;; Host and listing type notation:
 ;;;
 ;;; The functions efs-host-type and efs-listing-type, and the
 ;;; variable efs-dired-host-type follow the following conventions
 the option to type commands at the FTP connection.  Normally, the connection
 is killed first.  Note that doing this may result in the FTP process filter
 getting out of synch with the FTP client, so using this feature routinely
 isn't recommended.")
+(defvar efs-use-passive-mode nil
+"*If non-nil, the ftp client will specify passive mode for all transfers.")
 ;;; Hooks and crooks.
 (defvar efs-ftp-startup-hook nil
 "Hook to run immediately after starting the FTP client.
 This hook is run before the FTP OPEN command is sent.")
 ;; file existence.
 (defvar efs-cmd-ok-cmds
 (concat
 "^quote port \\|^type \\|^quote site \\|^chmod \\|^quote noop\\|"
-"^quote pasv"))
+"^quote pasv\\|^passive"))
 ;; Regexp to match commands for which efs-cmd-ok-msgs is a valid server
 ;; response for success.
 (defvar efs-passwd-cmds
 "^quote pass \\|^quote acct \\|^quote site gpass ")
 "^2[01345][0-7] \\|" ; 2yz = positive completion reply
 "^22[02-7] \\|"      ; 221 = successful logout
 			; (Sometimes get this with a timeout,
 			; so treat as fatal.)
 "^3[0-5][0-7] \\|"    ; 3yz = positive intermediate reply
+;; passive
+"^[Pp]assive \\|"
 ;; client codes
 "^[Hh]ash mark "))
 ;; Response to indicate that the requested action was successfully completed.
 (defvar efs-failed-msgs
 		(progn
 		  ;; Tell client to send back hash-marks as progress.  It isn't
 		  ;; usually fatal if this command fails.
 		  (efs-guess-hash-mark-size proc)
+		  (if efs-use-passive-mode
+		      (efs-passive-mode host user))
 		  ;; Run any user startup functions
 		  (let ((alist efs-ftp-startup-function-alist)
 			(case-fold-search t))
 		    (while alist
 		    (if (string-match "^[0-9]+$" size)
 			(set (if gate-p
 				 'efs-gateway-hash-mark-size
 			       'efs-hash-mark-size)
 			     (string-to-int size))))))))))
+(defun efs-passive-mode (host user)
+;; put ftp into passive mode
+(efs-send-cmd host user '(passive)))
 ;;;; ------------------------------------------------------------
 ;;;; Simple FTP process shell support.
 ;;;; ------------------------------------------------------------
 					   (efs-fix-path host-type cmd1))
 		    cmd2 (efs-quote-string host-type
 					   (efs-fix-path host-type cmd2))
 		    cmd-string (concat "rename " cmd1 " " cmd2))))
+	   ;; passive command
+	   ((eq cmd0 'passive)
+	    (setq cmd-string "passive"))
 	   (t
 	    (error "efs: Don't know how to send %s %s %s %s"
 		   cmd0 cmd1 cmd2 cmd3))))
 	;; Actually send the resulting command.
 (let ((gate (efs-use-gateway-p host)))
 (if (eq gate 'kerberos)
 	(progn
 	  (setq proc (efs-kerberos-login host user proc))
 	  (efs-login-send-user host user proc gate))
-(let ((to (if (memq gate '(proxy local raptor))
+(let ((to (if (memq gate '(proxy raptor))
 		    efs-gateway-host
 		  host))
 	    port cmd result)
 	(if (string-match "#" to)
 	    (setq port (substring to (match-end 0))
 (defun efs-login-send-user (host user proc &optional gate retry)
 "Send user command to HOST and USER. PROC is the ftp client process.
 Optional argument GATE specifies which type of gateway is being used.
 RETRY argument specifies to try twice if we get a 421 response."
 (let ((cmd (cond
-	      ((memq gate '(local proxy interlock))
+	      ((memq gate '(proxy interlock))
 	       (format "quote USER \"%s\"@%s" user
 		       (if (and efs-nslookup-on-connect
 				(string-match "[^0-9.]" host))
 			   (efs-nslookup-host host)
 			 host)))
 		       (setq to (concat to "@" port))))
 		 (format "quote user \"%s\"@%s" user to)))
 	      (t
 	       (format "quote user \"%s\"" user))))
 	(msg (format "Logging in as user %s%s..." user
-		     (if (memq gate '(proxy local raptor kerberos))
+		     (if (memq gate '(proxy raptor kerberos))
 			 (concat "@" host) "")))
 	result code)
 ;; Send the message by hand so that we can report on the size
 ;; of the MOTD.

Mercurial > hg > xemacs-beta

comparison lisp/efs/efs.el @ 138:6608ceec7cf8 r20-2b3