Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-21 12:27:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

ange-ftp fixes for dired switches not being just a single short option.

Browse source 
* lisp/net/ange-ftp.el (ange-ftp-switches-ok): New function.
(ange-ftp-get-files): Use it.
This commit is contained in:
Glenn Morris 2011-06-08 23:07:11 -07:00
parent 254c37a51d
commit e8b08aeeca
2 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2011-06-09 Glenn Morris <rgm@gnu.org>
* net/ange-ftp.el (ange-ftp-switches-ok): New function.
(ange-ftp-get-files): Use it.
2011-06-09 Alexander Klimov <alserkli@inbox.ru> (tiny change)
* mail/sendmail.el (mail-recover-1, mail-recover):

43
lisp/net/ange-ftp.el
View file

@ -2806,6 +2806,19 @@ match subdirectories as well.")
(and files (puthash (file-name-as-directory directory)
files ange-ftp-files-hashtable)))
(defun ange-ftp-switches-ok (switches)
"Return SWITCHES (a string) if suitable for our use."
(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)
(string-match "\\(\\`\\| \\)-[[:alpha:]]*l" switches)
(not (string-match
"--recursive\\>\\|\\(\\`\\| \\)-[[:alpha:]]*R" switches))
switches))
(defun ange-ftp-get-files (directory &optional no-error)
"Given a DIRECTORY, return a hashtable of file entries.
This will give an error or return nil, depending on the value of
@ -2817,30 +2830,12 @@ NO-ERROR, if a listing for DIRECTORY cannot be obtained."
;; This is an efficiency hack. We try to
;; anticipate what sort of listing dired
;; might want, and cache just such a listing.
(if (and (boundp 'dired-actual-switches)
(stringp dired-actual-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
"[aA]" dired-actual-switches)
(string-match
"l" dired-actual-switches)
(not (string-match
"R" dired-actual-switches)))
dired-actual-switches
(if (and (boundp 'dired-listing-switches)
(stringp dired-listing-switches)
(string-match
"[aA]" dired-listing-switches)
(string-match
"l" dired-listing-switches)
(not (string-match
"R" dired-listing-switches)))
dired-listing-switches
"-al"))
(or (and (boundp 'dired-actual-switches)
(ange-ftp-switches-ok dired-actual-switches))
(and (boundp 'dired-listing-switches)
(ange-ftp-switches-ok
dired-listing-switches))
"-al")
t no-error)
(gethash directory ange-ftp-files-hashtable)))))