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:
06982ac
)
Some improved fuzzy-parent-dir logic.
author
Wayne Davison
<wayned@samba.org>
Thu, 23 Feb 2006 20:27:17 +0000
(20:27 +0000)
committer
Wayne Davison
<wayned@samba.org>
Thu, 23 Feb 2006 20:27:17 +0000
(20:27 +0000)
generator.c
patch
|
blob
|
blame
|
history
diff --git
a/generator.c
b/generator.c
index
b6abc2c
..
2b6c253
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-773,7
+773,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
static int missing_below = -1, excluded_below = -1;
static char *parent_dirname = "";
static struct file_list *fuzzy_dirlist = NULL;
static int missing_below = -1, excluded_below = -1;
static char *parent_dirname = "";
static struct file_list *fuzzy_dirlist = NULL;
- static
struct file_list *need_dirlist = (struct file_list *)""
;
+ static
int need_fuzzy_dirlist = 0
;
struct file_struct *fuzzy_file = NULL;
int fd = -1, f_copy = -1;
STRUCT_STAT st, real_st, partial_st;
struct file_struct *fuzzy_file = NULL;
int fd = -1, f_copy = -1;
STRUCT_STAT st, real_st, partial_st;
@@
-789,8
+789,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
if (!fname) {
if (fuzzy_dirlist) {
if (!fname) {
if (fuzzy_dirlist) {
- if (fuzzy_dirlist != need_dirlist)
- flist_free(fuzzy_dirlist);
+ flist_free(fuzzy_dirlist);
fuzzy_dirlist = NULL;
}
if (missing_below >= 0) {
fuzzy_dirlist = NULL;
}
if (missing_below >= 0) {
@@
-841,16
+840,15
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
full_fname(dn));
}
if (fuzzy_dirlist) {
full_fname(dn));
}
if (fuzzy_dirlist) {
- if (fuzzy_dirlist != need_dirlist)
- flist_free(fuzzy_dirlist);
+ flist_free(fuzzy_dirlist);
fuzzy_dirlist = NULL;
}
if (fuzzy_basis)
fuzzy_dirlist = NULL;
}
if (fuzzy_basis)
-
fuzzy_dirlist = need_dirlist
;
+
need_fuzzy_dirlist = 1
;
}
parent_dirname = dn;
}
parent_dirname = dn;
- if (
fuzzy_dirlist == need
_dirlist && S_ISREG(file->mode))
+ if (
need_fuzzy
_dirlist && S_ISREG(file->mode))
fuzzy_dirlist = get_dirlist(dn, -1, 1);
statret = link_stat(fname, &st,
fuzzy_dirlist = get_dirlist(dn, -1, 1);
statret = link_stat(fname, &st,