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:
e341588
)
Use the new FNAMECMP_BASIS_DIR_HIGH to improve a compare-dest check.
author
Wayne Davison
<wayned@samba.org>
Sat, 15 Jan 2005 21:17:39 +0000
(21:17 +0000)
committer
Wayne Davison
<wayned@samba.org>
Sat, 15 Jan 2005 21:17:39 +0000
(21:17 +0000)
generator.c
patch
|
blob
|
blame
|
history
diff --git
a/generator.c
b/generator.c
index
e9e47ac
..
2ffd03f
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-47,7
+47,7
@@
extern int protocol_version;
extern int always_checksum;
extern char *partial_dir;
extern char *basis_dir[];
extern int always_checksum;
extern char *partial_dir;
extern char *basis_dir[];
-extern int co
py
_dest;
+extern int co
mpare
_dest;
extern int link_dest;
extern int whole_file;
extern int local_server;
extern int link_dest;
extern int whole_file;
extern int local_server;
@@
-467,13
+467,13
@@
static void recv_generator(char *fname, struct file_struct *file, int i,
safe_fname(fname));
}
fnamecmp = fnamecmpbuf;
safe_fname(fname));
}
fnamecmp = fnamecmpbuf;
- fnamecmp_type =
FNAMECMP_BASIS_DIR +
i;
+ fnamecmp_type = i;
}
} else
#endif
{
fnamecmp = fnamecmpbuf;
}
} else
#endif
{
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,
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)) {
if (fnamecmp_type == FNAMECMP_FNAME)
;
else if (unchanged_file(fnamecmp, file, &st)) {
if (fnamecmp_type == FNAMECMP_FNAME)