[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  a106ed7 Fix the leaving of a temp file w/o partial-file saving. Fixed bug 10350.
      from  bba31dd Avoid ACL and/or xattr lookups on IS_MISSING_FILE() entries. Fixes bug 10381.

;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a106ed78d57f901ccfdf5145923f8c2bf6b33ef8
Author: Wayne Davison <wayned at samba.org>
Date:   Sun Jan 19 14:35:05 2014 -0800

    Fix the leaving of a temp file w/o partial-file saving.
    Fixed bug 10350.

-----------------------------------------------------------------------

Summary of changes:
 cleanup.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/cleanup.c b/cleanup.c
index c750ba6..961c1d2 100644
--- a/cleanup.c
+++ b/cleanup.c
@@ -156,8 +156,6 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
 		switch_step++;
 
 		if (cleanup_got_literal && (cleanup_fname || cleanup_fd_w != -1)) {
-			const char *fname = cleanup_fname;
-			cleanup_fname = NULL;
 			if (cleanup_fd_r != -1) {
 				close(cleanup_fd_r);
 				cleanup_fd_r = -1;
@@ -167,9 +165,11 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
 				close(cleanup_fd_w);
 				cleanup_fd_w = -1;
 			}
-			if (fname && cleanup_new_fname && keep_partial
+			if (cleanup_fname && cleanup_new_fname && keep_partial
 			 && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) {
 				int tweak_modtime = 0;
+				const char *fname = cleanup_fname;
+				cleanup_fname = NULL;
 				if (!partial_dir) {
 				    /* We don't want to leave a partial file with a modern time or it
 				     * could be skipped via --update.  Setting the time to something


-- 
The rsync repository.