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:
45478cc
)
Tweaked check in front of delete_files() call.
author
Wayne Davison
<wayned@samba.org>
Sat, 29 Jan 2005 22:35:47 +0000
(22:35 +0000)
committer
Wayne Davison
<wayned@samba.org>
Sat, 29 Jan 2005 22:35:47 +0000
(22:35 +0000)
main.c
patch
|
blob
|
blame
|
history
diff --git
a/main.c
b/main.c
index
b4cb90a
..
f48febe
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-34,7
+34,6
@@
extern int blocking_io;
extern int cvs_exclude;
extern int delete_mode;
extern int delete_before;
extern int cvs_exclude;
extern int delete_mode;
extern int delete_before;
-extern int delete_after;
extern int delete_excluded;
extern int daemon_over_rsh;
extern int do_stats;
extern int delete_excluded;
extern int daemon_over_rsh;
extern int do_stats;
@@
-501,10
+500,9
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
if (preserve_hard_links)
init_hard_links(flist);
if (preserve_hard_links)
init_hard_links(flist);
- if (delete_before) {
- /* I moved this here from recv_files() to prevent a race condition */
- if (recurse && !local_name && flist->count > 0)
- delete_files(flist);
+ if (delete_before && !local_name && flist->count > 0) {
+ /* Moved here from recv_files() to prevent a race condition */
+ delete_files(flist);
}
if (fd_pair(error_pipe) < 0
}
if (fd_pair(error_pipe) < 0