/[emacs]/emacs/lisp/net/ange-ftp.el
ViewVC logotype

Diff of /emacs/lisp/net/ange-ftp.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.64 by ttn, Tue May 17 16:24:36 2005 UTC revision 1.65 by lektu, Wed May 18 10:18:42 2005 UTC
# Line 1646  good, skip, fatal, or unknown." Line 1646  good, skip, fatal, or unknown."
1646                      ;; if we gave an empty password to the USER command earlier                      ;; if we gave an empty password to the USER command earlier
1647                      ;; then we should send a null password now.                      ;; then we should send a null password now.
1648                      (if (string-match "Password: *$" ange-ftp-process-string)                      (if (string-match "Password: *$" ange-ftp-process-string)
1649                          (send-string proc "\n"))))                          (process-send-string proc "\n"))))
1650                (while (and ange-ftp-process-busy                (while (and ange-ftp-process-busy
1651                            (string-match "\n" ange-ftp-process-string))                            (string-match "\n" ange-ftp-process-string))
1652                  (let ((line (substring ange-ftp-process-string                  (let ((line (substring ange-ftp-process-string
# Line 1741  good, skip, fatal, or unknown." Line 1741  good, skip, fatal, or unknown."
1741      ;; Replace STR by the result of the comint processing.      ;; Replace STR by the result of the comint processing.
1742      (setq str (buffer-substring comint-last-output-start (process-mark proc))))      (setq str (buffer-substring comint-last-output-start (process-mark proc))))
1743    (cond ((string-match "login: *$" str)    (cond ((string-match "login: *$" str)
1744           (send-string proc           (process-send-string proc
1745                        (concat                                (concat
1746                         (let ((ange-ftp-default-user t))                                 (let ((ange-ftp-default-user t))
1747                           (ange-ftp-get-user ange-ftp-gateway-host))                                   (ange-ftp-get-user ange-ftp-gateway-host))
1748                         "\n")))                                 "\n")))
1749          ((string-match "Password: *$" str)          ((string-match "Password: *$" str)
1750           (send-string proc           (process-send-string proc
1751                        (concat                                (concat
1752                         (ange-ftp-get-passwd ange-ftp-gateway-host                                 (ange-ftp-get-passwd ange-ftp-gateway-host
1753                                              (ange-ftp-get-user                                                      (ange-ftp-get-user
1754                                               ange-ftp-gateway-host))                                                       ange-ftp-gateway-host))
1755                         "\n")))                                 "\n")))
1756          ((string-match ange-ftp-gateway-fatal-msgs str)          ((string-match ange-ftp-gateway-fatal-msgs str)
1757           (delete-process proc)           (delete-process proc)
1758           (setq ange-ftp-gwp-running nil))           (setq ange-ftp-gwp-running nil))
# Line 1835  been queued with no result.  CONT will s Line 1835  been queued with no result.  CONT will s
1835                (insert (substring cmd 0 (match-end 0)) " Turtle Power!\n")                (insert (substring cmd 0 (match-end 0)) " Turtle Power!\n")
1836              (insert cmd)))              (insert cmd)))
1837          (move-marker comint-last-input-end (point))          (move-marker comint-last-input-end (point))
1838          (send-string proc cmd)          (process-send-string proc cmd)
1839          (set-marker (process-mark proc) (point))          (set-marker (process-mark proc) (point))
1840          (if nowait          (if nowait
1841              nil              nil

Legend:
Removed from v.1.64  
changed lines
  Added in v.1.65

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26