bug#19192: 25.0.50; TRAMP uses `dired-listing-switches' for ftp-connection

[Rasmus <rasmus@gmx.us>]

[-- Attachment #1: Type: text/plain, Size: 1574 bytes --]

Andreas Schwab <schwab@suse.de> writes:

> Rasmus <rasmus@gmx.us> writes:
>
>> diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
>> index d7632ed..5e9bc27 100644
>> --- a/lisp/net/ange-ftp.el
>> +++ b/lisp/net/ange-ftp.el
>> @@ -2831,16 +2831,20 @@ 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.
>>         (string-match
>>  	"--\\(almost-\\)?all\\>\\|\\(\\`\\| \\)-[[:alpha:]]*[aA]" switches)
>> +       ;; Allow flags starting with a single dash
>>         (string-match "\\(\\`\\| \\)-[[:alpha:]]*l" switches)
>> +       ;; Disallow recursive flag
>>         (not (string-match
>> -	     "--recursive\\>\\|\\(\\`\\| \\)-[[:alpha:]]*R" switches))
>> +	     "\\(\\`\\| \\)-[[:alpha:]]*R" switches))
>> +       ;; Disallow long flags.
>> +       (not (string-match "--\\w\\{2,\\}"))
>
> This contradicts the first string-match.

You are right.

How about this one: allow --(almost-)all for legacy reasons.  Disallow
other long flags.  Allow short flag as long as their is an "l" and not an
"R"?  (At least that was the intention).

—Rasmus

-- 
Together we will make the possible totalllly impossible!

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-ange-ftp.el-Disallow-more-dired-ls-flags.patch --]
[-- Type: text/x-diff, Size: 2526 bytes --]

From 07f99a06a30e271989a27dc58a2db54602d60e51 Mon Sep 17 00:00:00 2001
From: rasmus <x200s@pank.eu>
Date: Wed, 10 Dec 2014 16:18:00 +0100
Subject: [PATCH] ange-ftp.el: Disallow more dired ls-flags

* net/ange-ftp.el (ange-ftp-switches-ok): Disallow most lonng flags,
  as they may cause Tramp-breakage.

Fixes: debbugs:19192
---
 lisp/ChangeLog       |  6 ++++++
 lisp/net/ange-ftp.el | 20 ++++++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 454ee00..09b64f5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-29  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
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index d7632ed..db79c0d 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -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)
-- 
2.1.3