Commit bdc373bf authored by Rasmus Pank Roulund's avatar Rasmus Pank Roulund Committed by Michael Albinus

(ange-ftp-switches-ok): Disallow flags causing trouble with ls over ftp.

Fixes: debbugs:19192

* net/ange-ftp.el (ange-ftp-switches-ok): Disallow flags causing
trouble with ls over ftp.  These flags result in ls returning no
output, causing Tramp-breakage.
parent 94a3f764
2014-12-10 Rasmus Pank Roulund <emacs@pank.eu>
* net/ange-ftp.el (ange-ftp-switches-ok): Disallow flags causing
trouble with ls over ftp. These flags result in ls returning no
output, causing Tramp-breakage. (bug#19192)
2014-12-10 Andreas Schwab <schwab@suse.de>
* files.el (file-tree-walk): Use file-name-as-directory
......
......@@ -2831,16 +2831,24 @@ match subdirectories as well.")
files ange-ftp-files-hashtable)))
(defun ange-ftp-switches-ok (switches)
"Return SWITCHES (a string) if suitable for our use."
"Return SWITCHES (a string) if suitable for use with ls over ftp."
(and (stringp switches)
;; We allow the A switch, which lists all files except "." and
;; "..". This is OK because we manually insert these entries
;; in the hash table.
;; We allow the --almost-all switch, which lists all files
;; except "." and "..". This is OK because we manually
;; insert these entries in the hash table.
(string-match
"--\\(almost-\\)?all\\>\\|\\(\\`\\| \\)-[[:alpha:]]*[aA]" switches)
"--\\(almost-\\)?all\\>\\|\\(\\`\\| \\)-[[:alpha:]]*[aA]"
switches)
;; Disallow other long flags except --(almost-)all.
(not (string-match "\\(\\`\\| \\)--\\w+"
(replace-regexp-in-string
"--\\(almost-\\)?all\\>" ""
switches)))
;; Must include 'l'.
(string-match "\\(\\`\\| \\)-[[:alpha:]]*l" switches)
;; Disallow recursive flag.
(not (string-match
"--recursive\\>\\|\\(\\`\\| \\)-[[:alpha:]]*R" switches))
"\\(\\`\\| \\)-[[:alpha:]]*R" switches))
switches))
(defun ange-ftp-get-files (directory &optional no-error)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment