diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-08-16 00:13:48 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-08-16 00:13:48 -0700 |
| commit | e8bedf5a8836cdcb74b881eadba12564ca8de9ef (patch) | |
| tree | c66845a73b2e610f401198456b4585ff75a77da4 /lisp/net/ange-ftp.el | |
| parent | 58c4682f76b2417640a6789aaa8ee0ad9ab4bad9 (diff) | |
| download | emacs-e8bedf5a8836cdcb74b881eadba12564ca8de9ef.tar.gz emacs-e8bedf5a8836cdcb74b881eadba12564ca8de9ef.tar.bz2 emacs-e8bedf5a8836cdcb74b881eadba12564ca8de9ef.zip | |
* lisp/net/ange-ftp.el (ange-ftp-good-msgs, ange-ftp-get-pwd):
Handle "Remote Directory" response of some clients.
Fixes: debbugs:15058
Diffstat (limited to 'lisp/net/ange-ftp.el')
| -rw-r--r-- | lisp/net/ange-ftp.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index c3adb7208e9..b8e279be91b 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -1,7 +1,6 @@ ;;; ange-ftp.el --- transparent FTP support for GNU Emacs -;; Copyright (C) 1989-1996, 1998, 2000-2013 Free Software Foundation, -;; Inc. +;; Copyright (C) 1989-1996, 1998, 2000-2013 Free Software Foundation, Inc. ;; Author: Andy Norman (ange@hplb.hpl.hp.com) ;; Maintainer: FSF @@ -700,7 +699,7 @@ parenthesized expressions in REGEXP for the components (in that order)." "Regular expression matching the start of a multiline FTP reply.") (defvar ange-ftp-good-msgs - "^220 \\|^230 \\|^226 \\|^25. \\|^221 \\|^200 \\|^[Hh]ash mark" + "^220 \\|^230 \\|^226 \\|^25. \\|^221 \\|^200 \\|^[Hh]ash mark\\|^Remote directory:" "Regular expression matching FTP \"success\" messages.") ;; CMS and the odd VMS machine say 200 Port rather than 200 PORT. @@ -3021,6 +3020,9 @@ and LINE is the relevant success or fail line from the FTP-client." (if (car result) (save-match-data (and (or (string-match "\"\\([^\"]*\\)\"" line) + ;; Some clients cache the value and return it in + ;; this way without asking the server. (Bug#15058) + (string-match "^Remote directory: \\(.*\\)" line) (string-match " \\([^ ]+\\) " line)) ; stone-age VMS servers! (setq dir (match-string 1 line))))) (cons dir line))) |