procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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.
This commit is contained in:
Rasmus Pank Roulund 2014-12-10 17:47:53 +01:00 • committed by Michael Albinus
parent 94a3f7648c
commit bdc373bf45
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
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

20
lisp/net/ange-ftp.el
View file

@ -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)