[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#19192: 25.0.50; TRAMP uses `dired-listing-switches' for ftp-connecti
From: |
Rasmus |
Subject: |
bug#19192: 25.0.50; TRAMP uses `dired-listing-switches' for ftp-connection |
Date: |
Sat, 29 Nov 2014 13:47:41 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) |
Rasmus <rasmus@gmx.us> writes:
> Rasmus <rasmus@gmx.us> writes:
>
>> For now I will go with Option I.
>
> Well, turned out to be a bad idea. Instead I tested all flags in (man
> "ls") and exclude the flags that caused trouble. Note, I only have one
> ftp to test against. . . I'm assuming this one is somewhat common.
>
> Also, a limitation of the `ange-ftp-switches-ok' is that it's too
> destructive: I.e. rather than removing offending ls-flags, it will
> entirely disregard the whole thing. I guess that's another patch,
> though.
>
> If you find the patch OK, feel free to submit. Otherwise, let me know
> what to improve.
This patch uses the "right" email for the commit (I don't know if this
matters much). Otherwise identical.
--
The Kids call him Billy the Saint
>From 6fd921e7d7deb88c5a3f172022b64a0539edbdd6 Mon Sep 17 00:00:00 2001
From: Rasmus <w530@pank.eu>
Date: Sat, 29 Nov 2014 13:12:10 +0100
Subject: [PATCH 1/2] ange-ftp.el: Disallow more dired ls-flags
* 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.
Fixes: debbugs:19192
---
lisp/ChangeLog | 6 ++++++
lisp/net/ange-ftp.el | 12 +++++++++++-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2a450a7..7d0992e 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-11-29 Stephen Berman <stephen.berman@gmx.net>
Stefan Monnier <monnier@iro.umontreal.ca>
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index d7632ed..a2b0b46 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -2831,16 +2831,26 @@ 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))
+ ;; Disallow most long flags from (man "ls"), version 8.23 of July 2014.
+ (not (string-match
+ (concat
+ "--\\(block-size\\|color\\|format\\|group-directories-first\\|"
+
"human-readable\\|dereference-command-line\\|hide\\|indicator-style\\|"
+
"dereference-command-line-symlink-to-dir\\|inode\\|ignore\\|dereference\\|"
+
"numeric-uid-gid\\|indicator-style\\|hide-control-chars\\|quoting-style\\|"
+ "sort\\|time\\|time-style\\|width\\)")))
switches))
(defun ange-ftp-get-files (directory &optional no-error)
--
2.1.3