Skip to content

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

Use the new FNAMECMP_BASIS_DIR_HIGH to improve a compare-dest check.

parent e341588a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
generator.c
View file @ 2be2fb3e
...@@ -47,7 +47,7 @@ extern int protocol_version; ...@@ -47,7 +47,7 @@ extern int protocol_version;
extern int always_checksum; extern int always_checksum;
extern char *partial_dir; extern char *partial_dir;
extern char *basis_dir[]; extern char *basis_dir[];
extern int copy_dest; extern int compare_dest;
extern int link_dest; extern int link_dest;
extern int whole_file; extern int whole_file;
extern int local_server; extern int local_server;
...@@ -467,13 +467,13 @@ static void recv_generator(char *fname, struct file_struct *file, int i, ...@@ -467,13 +467,13 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
safe_fname(fname)); safe_fname(fname));
} }
fnamecmp = fnamecmpbuf; fnamecmp = fnamecmpbuf;
fnamecmp_type = FNAMECMP_BASIS_DIR + i; fnamecmp_type = i;
} }
} else } else
#endif #endif
{ {
fnamecmp = fnamecmpbuf; fnamecmp = fnamecmpbuf;
fnamecmp_type = FNAMECMP_BASIS_DIR + i; fnamecmp_type = i;
} }
} }
} }
...@@ -519,7 +519,7 @@ static void recv_generator(char *fname, struct file_struct *file, int i, ...@@ -519,7 +519,7 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
return; return;
} }
if ((link_dest || copy_dest) && fnamecmp_type != FNAMECMP_FNAME) if (!compare_dest && fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
; ;
else if (unchanged_file(fnamecmp, file, &st)) { else if (unchanged_file(fnamecmp, file, &st)) {
if (fnamecmp_type == FNAMECMP_FNAME) if (fnamecmp_type == FNAMECMP_FNAME)
......
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