comparison lisp/ange-ftp.el @ 5265:7305f7204c67

(ange-ftp-hash-mark-msgs): Make match more general. (ange-ftp-gateway-prompt-pattern): Don't match more than one line.
author Richard M. Stallman <rms@gnu.org>
date Thu, 23 Dec 1993 03:05:12 +0000
parents 85aadd2a80ba
children 722bd9d45ab2
comparison
equal deleted inserted replaced
5264:a60a8979d34b 5265:7305f7204c67
727 (defvar ange-ftp-gateway-program (if (eq system-type 'hpux) "remsh" "rsh") 727 (defvar ange-ftp-gateway-program (if (eq system-type 'hpux) "remsh" "rsh")
728 "*Name of program to spawn a shell on the gateway machine. Valid candidates 728 "*Name of program to spawn a shell on the gateway machine. Valid candidates
729 are rsh (remsh on hp-ux), telnet and rlogin. See also the gateway variable 729 are rsh (remsh on hp-ux), telnet and rlogin. See also the gateway variable
730 above.") 730 above.")
731 731
732 (defvar ange-ftp-gateway-prompt-pattern "^[^#$%>;]*[#$%>;] *" 732 (defvar ange-ftp-gateway-prompt-pattern "^[^#$%>;\n]*[#$%>;] *"
733 "*Regexp used to detect that the logging-in sequence is completed on the 733 "*Regexp used to detect that the logging-in sequence is completed on the
734 gateway machine and that the shell is now awaiting input. Make this regexp as 734 gateway machine and that the shell is now awaiting input. Make this regexp as
735 strict as possible; it shouldn't match *anything* at all except the user's 735 strict as possible; it shouldn't match *anything* at all except the user's
736 initial prompt. The above string will fail under most SUN-3's since it 736 initial prompt. The above string will fail under most SUN-3's since it
737 matches the login banner.") 737 matches the login banner.")
855 855
856 ;;;; ------------------------------------------------------------ 856 ;;;; ------------------------------------------------------------
857 ;;;; Internal variables. 857 ;;;; Internal variables.
858 ;;;; ------------------------------------------------------------ 858 ;;;; ------------------------------------------------------------
859 859
860 (defconst ange-ftp-version "$Revision: 1.36 $") 860 (defconst ange-ftp-version "$Revision: 1.37 $")
861 861
862 (defvar ange-ftp-data-buffer-name " *ftp data*" 862 (defvar ange-ftp-data-buffer-name " *ftp data*"
863 "Buffer name to hold directory listing data received from ftp process.") 863 "Buffer name to hold directory listing data received from ftp process.")
864 864
865 (defvar ange-ftp-netrc-modtime nil 865 (defvar ange-ftp-netrc-modtime nil
1849 (ange-ftp-error host user 1849 (ange-ftp-error host user
1850 (concat "USER request failed: " 1850 (concat "USER request failed: "
1851 (cdr result))))))) 1851 (cdr result)))))))
1852 1852
1853 (defvar ange-ftp-hash-mark-msgs 1853 (defvar ange-ftp-hash-mark-msgs
1854 "[hH]ash mark [^0-9]*\\([0-9]+\\)" 1854 "[hH]ash mark \\(printing on \\)?(?[^0-9]*\\([0-9]+\\)"
1855 "*Regexp matching the FTP client's output upon doing a HASH command.") 1855 "*Regexp matching the FTP client's output upon doing a HASH command.")
1856 1856
1857 (defun ange-ftp-guess-hash-mark-size (proc) 1857 (defun ange-ftp-guess-hash-mark-size (proc)
1858 (if ange-ftp-send-hash 1858 (if ange-ftp-send-hash
1859 (save-excursion 1859 (save-excursion