Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added --existing option, similar to one suggested by Gildas Quiniou <gildas@stip.fr>
[rsync/rsync.git]
/
receiver.c
diff --git
a/receiver.c
b/receiver.c
index
9621578
..
890fadd
100644
(file)
--- a/
receiver.c
+++ b/
receiver.c
@@
-304,14
+304,17
@@
int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
int recv_ok;
extern struct stats stats;
extern int preserve_perms;
int recv_ok;
extern struct stats stats;
extern int preserve_perms;
+ extern int delete_after;
struct stats initial_stats;
if (verbose > 2) {
rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
}
struct stats initial_stats;
if (verbose > 2) {
rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
}
- if (recurse && delete_mode && !local_name && flist->count>0) {
- delete_files(flist);
+ if (!delete_after) {
+ if (recurse && delete_mode && !local_name && flist->count>0) {
+ delete_files(flist);
+ }
}
while (1) {
}
while (1) {
@@
-478,6
+481,12
@@
int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
}
}
}
}
+ if (delete_after) {
+ if (recurse && delete_mode && !local_name && flist->count>0) {
+ delete_files(flist);
+ }
+ }
+
if (preserve_hard_links)
do_hard_links(flist);
if (preserve_hard_links)
do_hard_links(flist);