Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
aec6b9f
)
Added a "overwriting_basis" arg to finish_transfer().
author
Wayne Davison
<wayned@samba.org>
Mon, 10 Jan 2005 10:03:12 +0000
(10:03 +0000)
committer
Wayne Davison
<wayned@samba.org>
Mon, 10 Jan 2005 10:03:12 +0000
(10:03 +0000)
rsync.c
patch
|
blob
|
blame
|
history
diff --git
a/rsync.c
b/rsync.c
index
f8206e5
..
1b28c35
100644
(file)
--- a/
rsync.c
+++ b/
rsync.c
@@
-240,7
+240,7
@@
void sig_int(void)
/* finish off a file transfer, renaming the file and setting the permissions
and ownership */
void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
/* finish off a file transfer, renaming the file and setting the permissions
and ownership */
void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
- int ok_to_set_time)
+ int ok_to_set_time
, int overwriting_basis
)
{
int ret;
{
int ret;
@@
-250,7
+250,7
@@
void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
goto do_set_perms;
}
goto do_set_perms;
}
- if (make_backups && !make_backup(fname))
+ if (make_backups &&
overwriting_basis &&
!make_backup(fname))
return;
/* Change permissions before putting the file into place. */
return;
/* Change permissions before putting the file into place. */