aboutsummaryrefslogtreecommitdiffstats
path: root/rsync.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2008-05-22 07:32:11 -0700
committerWayne Davison <wayned@samba.org>2008-05-22 07:32:11 -0700
commit4337eeb754bb0b8d903a96c2d3b35306484b12cc (patch)
tree58d2446bbe84b432de125ee70cf248bc5a9d02fd /rsync.c
parent928da42359dff226f7f1fbcb36d3c150c4e95ba9 (diff)
downloadandroid_external_rsync-4337eeb754bb0b8d903a96c2d3b35306484b12cc.tar.gz
android_external_rsync-4337eeb754bb0b8d903a96c2d3b35306484b12cc.tar.bz2
android_external_rsync-4337eeb754bb0b8d903a96c2d3b35306484b12cc.zip
A cuple more fixes for --xattrs combined with --backup, this time to
handle when --link-dest is also used.
Diffstat (limited to 'rsync.c')
-rw-r--r--rsync.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/rsync.c b/rsync.c
index 9921da04..85244c88 100644
--- a/rsync.c
+++ b/rsync.c
@@ -564,7 +564,8 @@ int finish_transfer(const char *fname, const char *fnametmp,
if (make_backups > 0 && overwriting_basis) {
if (!make_backup(fname))
return 1;
- fnamecmp = get_backup_name(fname);
+ if (fnamecmp == fname)
+ fnamecmp = get_backup_name(fname);
}
/* Change permissions before putting the file into place. */