Re: File names with spaces and tramp/ftp

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

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

Stefan Monnier <monnier@iro.umontreal.ca> writes:

>>> I could change ange-ftp to this encoding style of file names; but I am
>>> anxious: it could break ange-ftp on other systems, where double quotes
>>> might not be supported.
>
>> Does it help to use shell-quote-argument?
>
> I doubt it: the FTP command is not passed through a shell.
> In some cases it may work, of course.

But it is a good approximation. Under GNU/Linux, we have

  (shell-quote-argument "file name with spaces 'and \"quotes")
    => "file\\ name\\ with\\ spaces\\ \\'and\\ \\\"quotes"

W32 systems do 

  (shell-quote-argument "file name with spaces 'and \"quotes")
    => "\"file name with spaces 'and \\\"quotes\""

Both quotations work with stock FTP clients except the quotation of
"\"" on W32 systems: it shall be "\"\" instead of "\\\"". But this
could be adapted, and "\"" isn't so usual on W32 file names. Btw, I
could not create the file "~/file name with spaces 'and \"quotes" on
W32 in Emacs; this worked only with Emacs under GNU/Linux.

Lennart (et al), could you, please, test whether the appended patch
works for you for file names with spaces? And that there isn't any
other regression?

The patch is towards ange-ftp.el in the trunk.

>         Stefan

Best regards, Michael.


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

*** /usr/local/src/emacs/lisp/net/ange-ftp.el.~1~	Wed Feb  6 20:49:56 2008
--- /usr/local/src/emacs/lisp/net/ange-ftp.el	Tue Feb 12 13:46:33 2008
***************
*** 1523,1541 ****
  
  (defun ange-ftp-quote-string (string)
    "Quote any characters in STRING that may confuse the ftp process."
!   (apply 'concat
! 	 (mapcar (lambda (char)
! 		   ;; This is said to be wrong; ftp is said to
! 		   ;; need quoting only for ", and that by doubling it.
! 		   ;; But experiment says this kind of quoting is correct
! 		   ;; when talking to ftp on GNU/Linux systems.
! 		   (if (or (<= char ? )
! 			   (> char ?\~)
! 			   (= char ?\")
! 			   (= char ?\\))
! 		       (vector ?\\ char)
! 		     (vector char)))
! 		 string)))
  
  (defun ange-ftp-barf-if-not-directory (directory)
    (or (file-directory-p directory)
--- 1523,1529 ----
  
  (defun ange-ftp-quote-string (string)
    "Quote any characters in STRING that may confuse the ftp process."
!   (when (stringp string) (shell-quote-argument string)))
  
  (defun ange-ftp-barf-if-not-directory (directory)
    (or (file-directory-p directory)
***************
*** 3766,3772 ****
  	    (ange-ftp-send-cmd
  	     t-host
  	     t-user
! 	     (list 'put (or temp2 filename) t-name)
  	     (or msg
  		 (if (and temp2 f-parsed)
  		     (format "Putting %s" newname)
--- 3754,3760 ----
  	    (ange-ftp-send-cmd
  	     t-host
  	     t-user
! 	     (list 'put (or temp2 (ange-ftp-quote-string filename)) t-name)
  	     (or msg
  		 (if (and temp2 f-parsed)
  		     (format "Putting %s" newname)