diff options
| author | Wayne Davison <wayned@samba.org> | 2005-02-23 02:14:00 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2005-02-23 02:14:00 +0000 |
| commit | 38e3910b6f37eab2156496d1c4837c306235e9c7 (patch) | |
| tree | c90baf747ec9ae04f310f0bee4d3b40fb78e5965 /main.c | |
| parent | c26c51a7ee66c0a5d4bb25670b8ef31487421e66 (diff) | |
| download | android_external_rsync-38e3910b6f37eab2156496d1c4837c306235e9c7.tar.gz android_external_rsync-38e3910b6f37eab2156496d1c4837c306235e9c7.tar.bz2 android_external_rsync-38e3910b6f37eab2156496d1c4837c306235e9c7.zip | |
One more tweak to the need_name_pipe logic.
Diffstat (limited to 'main.c')
| -rw-r--r-- | main.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -49,6 +49,7 @@ extern int fuzzy_basis; extern int relative_paths; extern int rsync_port; extern int inplace; +extern int make_backups; extern int whole_file; extern int read_batch; extern int write_batch; @@ -499,7 +500,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) int status = 0; int error_pipe[2], name_pipe[2]; BOOL need_name_pipe = (basis_dir[0] || partial_dir || fuzzy_basis - || inplace) && !dry_run; + || (inplace && make_backups)) && !dry_run; /* The receiving side mustn't obey this, or an existing symlink that * points to an identical file won't be replaced by the referent. */ |