diff options
author | Michael Albinus <michael.albinus@gmx.de> | 2019-11-04 17:34:31 +0100 |
---|---|---|
committer | Michael Albinus <michael.albinus@gmx.de> | 2019-11-04 17:34:31 +0100 |
commit | dd19cc3aa16ccc441a8a2bfcdeb3005a6eef2543 (patch) | |
tree | 42bd79ad2020a595244d981f0598b6e4595191bc /lisp/net/tramp-smb.el | |
parent | a256e03bd944384efb3da05858264a5d3b72462d (diff) | |
download | emacs-dd19cc3aa16ccc441a8a2bfcdeb3005a6eef2543.tar.gz emacs-dd19cc3aa16ccc441a8a2bfcdeb3005a6eef2543.tar.bz2 emacs-dd19cc3aa16ccc441a8a2bfcdeb3005a6eef2543.zip |
Improve Tramp error handling
* lisp/net/tramp.el (tramp-set-syntax): Add missing argument.
(tramp-signal-hook-function): Make it more robust.
(tramp-handle-directory-files):
* lisp/net/tramp-adb.el
(tramp-adb-handle-directory-files-and-attributes)
(tramp-adb-handle-copy-file, tramp-adb-handle-rename-file):
* lisp/net/tramp-gvfs.el (tramp-gvfs-do-copy-or-rename-file):
* lisp/net/tramp-rclone.el (tramp-rclone-do-copy-or-rename-file)
(tramp-rclone-handle-directory-files):
* lisp/net/tramp-sh.el (tramp-sh-handle-directory-files-and-attributes)
(tramp-sh-handle-copy-directory, tramp-do-copy-or-rename-file):
* lisp/net/tramp-smb.el (tramp-smb-handle-copy-directory)
(tramp-smb-handle-copy-file, tramp-smb-handle-directory-files)
(tramp-smb-handle-rename-file):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-do-copy-or-rename-file):
Improve error handling.
* test/lisp/net/tramp-tests.el (tramp-test11-copy-file)
(tramp-test12-rename-file, tramp-test14-delete-directory)
(tramp-test15-copy-directory, tramp-test16-directory-files)
(tramp-test19-directory-files-and-attributes): Extend tests.
Diffstat (limited to 'lisp/net/tramp-smb.el')
-rw-r--r-- | lisp/net/tramp-smb.el | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index 5e52b26e7c6..f87d4becfe0 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -415,6 +415,10 @@ pass to the OPERATION." (with-parsed-tramp-file-name (if t1 dirname newname) nil (with-tramp-progress-reporter v 0 (format "Copying %s to %s" dirname newname) + (unless (file-exists-p dirname) + (tramp-error + v tramp-file-missing + "Copying directory" "No such file or directory" dirname)) (when (and (file-directory-p newname) (not (tramp-compat-directory-name-p newname))) (tramp-error v 'file-already-exists newname)) @@ -570,6 +574,13 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." (if (file-directory-p filename) (copy-directory filename newname keep-date 'parents 'copy-contents) + (unless (file-exists-p filename) + (tramp-error + (tramp-dissect-file-name + (if (tramp-tramp-file-p filename) filename newname)) + tramp-file-missing + "Copying file" "No such file or directory" filename)) + (let ((tmpfile (file-local-copy filename))) (if tmpfile ;; Remote filename. @@ -669,6 +680,10 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." (defun tramp-smb-handle-directory-files (directory &optional full match nosort) "Like `directory-files' for Tramp files." + (unless (file-exists-p directory) + (tramp-error + (tramp-dissect-file-name directory) tramp-file-missing + "No such file or directory" directory)) (let ((result (mapcar #'directory-file-name (file-name-all-completions "" directory)))) ;; Discriminate with regexp. @@ -1333,6 +1348,10 @@ component is used as the target of the symlink." (with-parsed-tramp-file-name (if (tramp-tramp-file-p filename) filename newname) nil + (unless (file-exists-p filename) + (tramp-error + v tramp-file-missing + "Renaming file" "No such file or directory" filename)) (when (and (not ok-if-already-exists) (file-exists-p newname)) (tramp-error v 'file-already-exists newname)) (when (and (file-directory-p newname) |