[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: |
Andreas Schwab |
Subject: |
bug#19192: 25.0.50; TRAMP uses `dired-listing-switches' for ftp-connection |
Date: |
Wed, 10 Dec 2014 15:15:53 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux) |
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.
--
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."