mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-24 13:32:41 -08:00
Code Issues Projects Releases Wiki Activity

(ange-ftp-allow-child-lookup): Always return nil.

Browse source 
This fixes a bug that treated all files as directories.
(ange-ftp-insert-directory): Explicitly follow symlinks.

(ange-ftp-file-modtime): Use save-match-data.
This commit is contained in:
Richard M. Stallman 2001-12-29 20:48:06 +00:00
parent 59a58d5ec9
commit b4958f3f49
2 changed files with 42 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2001-12-29 Richard M. Stallman <rms@gnu.org>
* net/ange-ftp.el (ange-ftp-allow-child-lookup): Always return nil.
This fixes a bug that treated all files as directories.
(ange-ftp-insert-directory): Explicitly follow symlinks.
2001-12-28 Simon Josefsson <jas@extundo.com>
* mail/sendmail.el (mail-envelope-from): Fix :type.

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

@ -2780,24 +2780,31 @@ NO-ERROR, if a listing for DIRECTORY cannot be obtained."
;; 2. The syntax of FILE and DIR make it impossible that FILE could be a valid
;; subdirectory. This is of course an OS dependent judgement.
;;; Nowadays, the judgement for #2 is always "no".
;;; With today's ftp servers on Unix and GNU systems,
;;; it appears to be impossible to tell from the result
;;; of the directory listing whether the argument is a directory.
;;; This appears to be true even in Emacs 20.7
(defmacro ange-ftp-allow-child-lookup (dir file)
`(not
(let* ((efile ,file) ; expand once.
(edir ,dir)
(parsed (ange-ftp-ftp-name edir))
(host-type (ange-ftp-host-type
(car parsed))))
(or
;; Deal with dired
(and (boundp 'dired-local-variables-file) ; in the dired-x package
(stringp dired-local-variables-file)
(string-equal dired-local-variables-file efile))
;; No dots in dir names in vms.
(and (eq host-type 'vms)
(string-match "\\." efile))
;; No subdirs in mts of cms.
(and (memq host-type '(mts cms))
(not (string-equal "/" (nth 2 parsed))))))))
nil)
;;; `(not
;;; (let* ((efile ,file) ; expand once.
;;; (edir ,dir)
;;; (parsed (ange-ftp-ftp-name edir))
;;; (host-type (ange-ftp-host-type
;;; (car parsed))))
;;; (or
;;; ;; Deal with dired
;;; (and (boundp 'dired-local-variables-file) ; in the dired-x package
;;; (stringp dired-local-variables-file)
;;; (string-equal dired-local-variables-file efile))
;;; ;; No dots in dir names in vms.
;;; (and (eq host-type 'vms)
;;; (string-match "\\." efile))
;;; ;; No subdirs in mts of cms.
;;; (and (memq host-type '(mts cms))
;;; (not (string-equal "/" (nth 2 parsed))))))))
(defun ange-ftp-file-entry-p (name)
"Given NAME, return whether there is a file entry for it."
@ -4318,13 +4325,19 @@ NEWNAME should be the name to give the new compressed or uncompressed file.")
(defun ange-ftp-insert-directory (file switches &optional wildcard full)
(let ((short (ange-ftp-abbreviate-filename file))
(parsed (ange-ftp-ftp-name (expand-file-name file))))
(parsed (ange-ftp-ftp-name (expand-file-name file)))
tem)
(if parsed
(insert
(if wildcard
(let ((default-directory (file-name-directory file)))
(ange-ftp-ls (file-name-nondirectory file) switches nil nil t))
(ange-ftp-ls file switches full)))
(if (and (not wildcard)
(setq tem (file-symlink-p (directory-file-name file))))
(ange-ftp-insert-directory
(ange-ftp-replace-name-component file tem)
switches wildcard full)
(insert
(if wildcard
(let ((default-directory (file-name-directory file)))
(ange-ftp-ls (file-name-nondirectory file) switches nil nil t))
(ange-ftp-ls file switches full))))q
(ange-ftp-real-insert-directory file switches wildcard full))))
(defun ange-ftp-dired-uncache (dir)