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
moved file deletion to before the fork() to prevent a race condition
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
6ea9321
..
a546778
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-280,10
+280,20
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
int recv_pipe[2];
int error_pipe[2];
extern int preserve_hard_links;
int recv_pipe[2];
int error_pipe[2];
extern int preserve_hard_links;
+ extern int delete_after;
+ extern int recurse;
+ extern int delete_mode;
if (preserve_hard_links)
init_hard_links(flist);
if (preserve_hard_links)
init_hard_links(flist);
+ if (!delete_after) {
+ /* I moved this here from recv_files() to prevent a race condition */
+ if (recurse && delete_mode && !local_name && flist->count>0) {
+ delete_files(flist);
+ }
+ }
+
if (pipe(recv_pipe) < 0) {
rprintf(FERROR,"pipe failed in do_recv\n");
exit_cleanup(RERR_SOCKETIO);
if (pipe(recv_pipe) < 0) {
rprintf(FERROR,"pipe failed in do_recv\n");
exit_cleanup(RERR_SOCKETIO);