# HG changeset patch # User Gerd Moellmann # Date 990192032 0 # Node ID 989feabdf50e96b3d1239b5bc680985c523684e0 # Parent a9c2bd492636efac6783184c48d23affecc9c74a (ange-ftp-fix-name-for-vms): Reverse args of subst-char-in-string. (ange-ftp-after-parse-ls-hook): New variable. (ange-ftp-ls): Run that hook. From Peter Milliken . diff -r a9c2bd492636 -r 989feabdf50e lisp/net/ange-ftp.el --- a/lisp/net/ange-ftp.el Fri May 18 13:10:43 2001 +0000 +++ b/lisp/net/ange-ftp.el Fri May 18 13:20:32 2001 +0000 @@ -2431,6 +2431,9 @@ (defvar ange-ftp-before-parse-ls-hook nil "Normal hook run before parsing the text of an ftp directory listing.") +(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 an `DIR' or `ls' command done over ftp. FILE is the full name of the remote file, LSARGS is any args to pass to the @@ -2502,6 +2505,11 @@ ange-ftp-parse-list-func-alist))) (funcall parse-func) (ange-ftp-parse-dired-listing lsargs)))) + ;; Place this hook here to convert the contents of the + ;; buffer to a ls compatible format if the host system + ;; that is being queried is other than Unix i.e. VMS + ;; returns an ls format that really sucks. + (run-hooks 'ange-ftp-after-parse-ls-hook) (setq ange-ftp-ls-cache-file key ange-ftp-ls-cache-lsargs lsargs ; For dumb hosts-types this is @@ -4767,7 +4775,7 @@ (substring name (match-beginning 3) (match-end 3)))) (and dir (setq dir (subst-char-in-string - ?. ?/ (substring dir 1 -1) t))) + ?/ ?. (substring dir 1 -1) t))) (concat (and drive (concat "/" drive "/")) dir (and dir "/") @@ -4780,7 +4788,7 @@ name (substring name (match-end 0)))) (setq tmp (file-name-directory name)) (if tmp - (setq dir (subst-char-in-string ?. ?/ (substring tmp 0 -1) t))) + (setq dir (subst-char-in-string ?/ ?. (substring tmp 0 -1) t))) (setq file (file-name-nondirectory name)) (concat drive (and dir (concat "[" (if drive nil ".") dir "]"))