summaryrefslogtreecommitdiff
path: root/test/src/fileio-tests.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2017-08-26 18:36:38 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2017-08-26 18:36:38 -0700
commite8001d4c27e1e33c83b9994aac4d5fc3feada2da (patch)
tree6910256d7cf7723aa1b3f7ab7779b91627ba52f6 /test/src/fileio-tests.el
parent937d9d7f60460edb1d3f978151599fddcbba2214 (diff)
downloademacs-e8001d4c27e1e33c83b9994aac4d5fc3feada2da.tar.gz
Do not munge contents of local symbolic links
This lets Emacs deal with arbitrary local symlinks without mishandling their contents (Bug#28156). For example, (progn (shell-command "ln -fs '~' 'x'") (rename-file "x" "/tmp/x")) now consistently creates a symbolic link from '/tmp/x' to '~'. Formerly, it did that only if the working directory was on the same filesystem as /tmp; otherwise, it expanded the '~' to the user's home directory. * lisp/dired.el (dired-get-filename): Use files--name-absolute-system-p instead of rolling our own code. * lisp/files.el (files--name-absolute-system-p): New function. (file-truename, file-chase-links): Use it to avoid mishandling symlink contents that begin with ~. (copy-directory, move-file-to-trash): Use concat rather than expand-file-name, to avoid mishandling symlink contents that begin with ~. * src/fileio.c (Fmake_symbolic_link): Do not expand leading "~" in the target unless interactive. Strip leading "/:" if interactive. (emacs_readlinkat): Do not prepend "/:" to the link target if it starts with "/" and contains ":" before NUL. * test/src/fileio-tests.el (try-link): Rename from try-char, and accept a string instead of a char. All uses changed. (fileio-tests--symlink-failure): Also test leading ~, and "/:", to test the new behavior.
Diffstat (limited to 'test/src/fileio-tests.el')
-rw-r--r--test/src/fileio-tests.el21
1 files changed, 10 insertions, 11 deletions
diff --git a/test/src/fileio-tests.el b/test/src/fileio-tests.el
index 2ef1b553ab4..5103d2f21e6 100644
--- a/test/src/fileio-tests.el
+++ b/test/src/fileio-tests.el
@@ -19,14 +19,13 @@
(require 'ert)
-(defun try-char (char link)
- (let ((target (string char)))
- (make-symbolic-link target link)
- (let* ((read-link (file-symlink-p link))
- (failure (unless (string-equal target read-link)
- (list 'string-equal target read-link))))
- (delete-file link)
- failure)))
+(defun try-link (target link)
+ (make-symbolic-link target link)
+ (let* ((read-link (file-symlink-p link))
+ (failure (unless (string-equal target read-link)
+ (list 'string-equal target read-link))))
+ (delete-file link)
+ failure))
(defun fileio-tests--symlink-failure ()
(let* ((dir (make-temp-file "fileio" t))
@@ -36,9 +35,9 @@
(char 0))
(while (and (not failure) (< char 127))
(setq char (1+ char))
- (unless (= char ?~)
- (setq failure (try-char char link))))
- failure)
+ (setq failure (try-link (string char) link)))
+ (or failure
+ (try-link "/:" link)))
(delete-directory dir t))))
(ert-deftest fileio-tests--odd-symlink-chars ()