Skip to content

L
liblongpath-rsync
Commit ea118be5 authored by Wayne Davison's avatar Wayne Davison
Browse files
Options

Fixed setting of updating_basis value.

parent 6a85ee96
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 4 deletions
receiver.c
View file @ ea118be5
...@@ -364,8 +364,6 @@ int recv_files(int f_in, char *local_name) ...@@ -364,8 +364,6 @@ int recv_files(int f_in, char *local_name)
if (delay_updates) if (delay_updates)
delayed_bits = bitbag_create(cur_flist->used + 1); delayed_bits = bitbag_create(cur_flist->used + 1);
updating_basis = inplace;
while (1) { while (1) {
cleanup_disable(); cleanup_disable();
...@@ -498,7 +496,6 @@ int recv_files(int f_in, char *local_name) ...@@ -498,7 +496,6 @@ int recv_files(int f_in, char *local_name)
fnamecmp = get_backup_name(fname); fnamecmp = get_backup_name(fname);
break; break;
case FNAMECMP_FUZZY: case FNAMECMP_FUZZY:
updating_basis = 0;
if (file->dirname) { if (file->dirname) {
pathjoin(fnamecmpbuf, MAXPATHLEN, pathjoin(fnamecmpbuf, MAXPATHLEN,
file->dirname, xname); file->dirname, xname);
...@@ -507,7 +504,6 @@ int recv_files(int f_in, char *local_name) ...@@ -507,7 +504,6 @@ int recv_files(int f_in, char *local_name)
fnamecmp = xname; fnamecmp = xname;
break; break;
default: default:
updating_basis = 0;
if (fnamecmp_type >= basis_dir_cnt) { if (fnamecmp_type >= basis_dir_cnt) {
rprintf(FERROR, rprintf(FERROR,
"invalid basis_dir index: %d.\n", "invalid basis_dir index: %d.\n",
...@@ -553,6 +549,7 @@ int recv_files(int f_in, char *local_name) ...@@ -553,6 +549,7 @@ int recv_files(int f_in, char *local_name)
fd1 = do_open(fnamecmp, O_RDONLY, 0); fd1 = do_open(fnamecmp, O_RDONLY, 0);
} }
} }
updating_basis = inplace && fnamecmp == fname;
if (fd1 == -1) { if (fd1 == -1) {
st.st_mode = 0; st.st_mode = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment