bug#53360: 29.0.50; Tramp/AngeFTP/Dired: Error about wrong ls usage when connecting to FTP server

[Michael Albinus <michael.albinus@gmx.de>]

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

Tassilo Horn <tsdh@gnu.org> writes:

Hi Tassilo,

> I've tried to connect to some FTP server using
>
>   C-x C-f /ftp:user@server.com: RET
>
> and got this usage error in the *ftp* buffer:
>
> ftp> ls -alh --group-directories-first /tmp/ange-ftpbNvAjx
> usage: ls remote-directory local-file
> ftp>
>
> I think those unrecognized arguments like --group-directories-first come
> due to the fact that I've set
>
>   (setq dired-listing-switches "-alh --group-directories-first")
>
> which is fine for normal dired but not FTP.
>
> I guess in the FTP case, there must be some dired-listing-switches
> sanitization, i.e., remove those options which are not valid for FTP.
> (I wouldn't care if it hard-coded the standard "-ah" for now.)

Could you pls check whether the appended patch fixes this for you?

Best regards, Michael.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1754 bytes --]

*** /tmp/ediffKwDzst	2022-02-06 18:04:22.926235692 +0100
--- /home/albinus/src/emacs/lisp/net/ange-ftp.el	2022-02-06 18:01:52.895457683 +0100
***************
*** 2547,2559 ****
  (defvar ange-ftp-after-parse-ls-hook nil
    "Normal hook run after parsing the text of an FTP directory listing.")

  (defun ange-ftp-ls (file lsargs parse &optional no-error wildcard)
    "Return the output of a `DIR' or `ls' command done over FTP.
  FILE is the full name of the remote file, LSARGS is any args to pass to the
  `ls' command, and PARSE specifies that the output should be parsed and stored
  away in the internal cache."
!   (while (string-match "^--dired\\s-+" lsargs)
!     (setq lsargs (replace-match "" nil t lsargs)))
    ;; If parse is t, we assume that file is a directory. i.e. we only parse
    ;; full directory listings.
    (let* ((ange-ftp-this-file (ange-ftp-expand-file-name file))
--- 2547,2562 ----
  (defvar ange-ftp-after-parse-ls-hook nil
    "Normal hook run after parsing the text of an FTP directory listing.")

+ (declare-function ls-lisp--sanitize-switches "ls-lisp" (switches))
+
  (defun ange-ftp-ls (file lsargs parse &optional no-error wildcard)
    "Return the output of a `DIR' or `ls' command done over FTP.
  FILE is the full name of the remote file, LSARGS is any args to pass to the
  `ls' command, and PARSE specifies that the output should be parsed and stored
  away in the internal cache."
!   (when (string-match "--" lsargs)
!     (require 'ls-lisp)
!     (setq lsargs (ls-lisp--sanitize-switches lsargs)))
    ;; If parse is t, we assume that file is a directory. i.e. we only parse
    ;; full directory listings.
    (let* ((ange-ftp-this-file (ange-ftp-expand-file-name file))