comparison lisp/files.el @ 1406:62dae4a3c7fb

* files.el (file-truename): The variable ~ should be considered an absolute pathname; handle it correctly. Concatenate the directory onto the filename in the correct order.

1405:45d463eff0b3

(defun file-truename (filename)
  "Return the truename of FILENAME, which should be absolute.
The truename of a file name is found by chasing symbolic links
both at the level of the file and at the level of the directories
containing it, until no links are left at any level."
  (let ((dir (file-name-directory filename))
	target)
    ;; Get the truename of the directory.
    (or (string= dir "/")
	(setq dir (file-name-as-directory (file-truename (directory-file-name dir)))))
    ;; Put it back on the file name.
    (setq filename (concat (file-name-nondirectory filename) dir))
    ;; Is the file name the name of a link?
    (setq target (file-symlink-p filename))
    (if target
	;; Yes => chase that link, then start all over
	;; since the link may point to a directory name that uses links.

1406:62dae4a3c7fb

(defun file-truename (filename)
  "Return the truename of FILENAME, which should be absolute.
The truename of a file name is found by chasing symbolic links
both at the level of the file and at the level of the directories
containing it, until no links are left at any level."
  (if (string= filename "~")
      (setq filename (expand-file-name filename)))
  (let ((dir (file-name-directory filename))
	target)
    ;; Get the truename of the directory.
    (or (string= dir "/")
	(setq dir (file-name-as-directory (file-truename (directory-file-name dir)))))
    ;; Put it back on the file name.
    (setq filename (concat dir (file-name-nondirectory filename)))
    ;; Is the file name the name of a link?
    (setq target (file-symlink-p filename))
    (if target
	;; Yes => chase that link, then start all over
	;; since the link may point to a directory name that uses links.