diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 40 |
2 files changed, 39 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 58ecb708be..98c7a540e9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2008-06-11 Michael Albinus <[email protected]> + + * net/tramp.el (tramp-make-temp-file): Backport from Tramp 2.1. + 2008-06-08 Michael Albinus <[email protected]> * uniquify.el (uniquify-get-proposed-name): Handle remote files. diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 5b2c9525b2..14cc608849 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -3779,12 +3779,42 @@ This will break if COMMAND prints a newline, followed by the value of ;; File Editing. +;; `make-temp-file' exists in Emacs only. The third parameter SUFFIX +;; has been introduced with Emacs 22. We try it, if it fails, we fall +;; back to `make-temp-name', creating the temporary file immediately +;; in order to avoid a security hole. (defsubst tramp-make-temp-file (filename) - (concat - (funcall (if (fboundp 'make-temp-file) 'make-temp-file 'make-temp-name) - (expand-file-name tramp-temp-name-prefix - (tramp-temporary-file-directory))) - (file-name-extension filename t))) + "Create a temporary file (compat function). +Add the extension of FILENAME, if existing." + (let* (file-name-handler-alist + (prefix (expand-file-name + (symbol-value 'tramp-temp-name-prefix) + (tramp-temporary-file-directory))) + (extension (file-name-extension filename t)) + result) + (condition-case nil + (setq result + (funcall (symbol-function 'make-temp-file) prefix nil extension)) + (error + ;; We use our own implementation, taken from files.el. + (while + (condition-case () + (progn + (setq result (concat (make-temp-name prefix) extension)) + (write-region + "" nil result nil 'silent nil + ;; 7th parameter is MUSTBENEW in Emacs, and + ;; CODING-SYSTEM in XEmacs. It is not a security + ;; hole in XEmacs if we cannot use this parameter, + ;; because XEmacs uses a user-specific subdirectory + ;; with 0700 permissions. + (when (not (featurep 'xemacs)) 'excl)) + nil) + (file-already-exists t)) + ;; The file was somehow created by someone else between + ;; `make-temp-name' and `write-region', let's try again. + nil))) + result)) (defun tramp-handle-file-local-copy (filename) "Like `file-local-copy' for tramp files." |