Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 10:27:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

* net/tramp-smb.el (tramp-smb-handle-copy-file)

Browse source 
(tramp-smb-handle-rename-file, tramp-smb-handle-write-region):
Delete temporary file in case of error.
This commit is contained in:
Michael Albinus 2009-01-05 19:40:55 +00:00
parent ce2cc72811
commit 91192f4fab
2 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lisp/ChangeLog
View file

@ -1,3 +1,13 @@
2009-01-05 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-handle-load)
(tramp-do-copy-or-rename-file-directly)
(tramp-handle-file-local-copy, tramp-handle-insert-file-contents)
(tramp-handle-write-region)
* net/tramp-smb.el (tramp-smb-handle-copy-file)
(tramp-smb-handle-rename-file, tramp-smb-handle-write-region):
Delete temporary file in case of error.
2009-01-05 Agustín Martín <agustin.martin@hispalinux.es>
* textmodes/ispell.el (ispell-check-version): Use (with-temp-buffer)

25
lisp/net/tramp-smb.el
View file

@ -216,7 +216,10 @@ PRESERVE-UID-GID is completely ignored."
(if tmpfile
;; Remote filename.
(rename-file tmpfile newname ok-if-already-exists)
(condition-case err
(rename-file tmpfile newname ok-if-already-exists)
(error (delete-file tmpfile)
(signal (car err) (cdr err))))
;; Remote newname.
(when (file-directory-p newname)
@ -548,10 +551,13 @@ PRESERVE-UID-GID is completely ignored."
(let ((tmpfile (file-local-copy filename)))
(if tmpfile
;; remote filename
(rename-file tmpfile newname ok-if-already-exists)
;; Remote filename.
(condition-case err
(rename-file tmpfile newname ok-if-already-exists)
(error (delete-file tmpfile)
(signal (car err) (cdr err))))
;; remote newname
;; Remote newname.
(when (file-directory-p newname)
(setq newname (expand-file-name
(file-name-nondirectory filename) newname)))
@ -618,12 +624,13 @@ errors for shares like \"C$/\", which are common in Microsoft Windows."
(list start end tmpfile append 'no-message lockname)))
(tramp-message v 5 "Writing tmp file %s to file %s..." tmpfile filename)
(if (tramp-smb-send-command v (format "put %s \"%s\"" tmpfile file))
(tramp-message
v 5 "Writing tmp file %s to file %s...done" tmpfile filename)
(tramp-error v 'file-error "Cannot write `%s'" filename))
(unwind-protect
(if (tramp-smb-send-command v (format "put %s \"%s\"" tmpfile file))
(tramp-message
v 5 "Writing tmp file %s to file %s...done" tmpfile filename)
(tramp-error v 'file-error "Cannot write `%s'" filename))
(delete-file tmpfile))
(delete-file tmpfile)
(unless (equal curbuf (current-buffer))
(tramp-error
v 'file-error