Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added ITEM_DUMMY_BIT and moved a few other 'ITEM_*'s around.
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
34462c8
..
7727e1f
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-585,7
+585,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
enum logcode code, int f_out)
{
static int missing_below = -1, excluded_below = -1;
enum logcode code, int f_out)
{
static int missing_below = -1, excluded_below = -1;
- static char *fuzzy_dirname =
NULL
;
+ static char *fuzzy_dirname =
""
;
static struct file_list *fuzzy_dirlist = NULL;
struct file_struct *fuzzy_file = NULL;
int fd = -1, f_copy = -1;
static struct file_list *fuzzy_dirlist = NULL;
struct file_struct *fuzzy_file = NULL;
int fd = -1, f_copy = -1;
@@
-603,7
+603,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
if (fuzzy_dirlist) {
flist_free(fuzzy_dirlist);
fuzzy_dirlist = NULL;
if (fuzzy_dirlist) {
flist_free(fuzzy_dirlist);
fuzzy_dirlist = NULL;
- fuzzy_dirname =
NULL
;
+ fuzzy_dirname =
""
;
}
if (missing_below >= 0) {
dry_run--;
}
if (missing_below >= 0) {
dry_run--;
@@
-647,15
+647,13
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
} else {
if (fuzzy_basis && S_ISREG(file->mode)) {
char *dn = file->dirname ? file->dirname : ".";
} else {
if (fuzzy_basis && S_ISREG(file->mode)) {
char *dn = file->dirname ? file->dirname : ".";
- /* Yes, identical dirnames are guaranteed to have
- * identical pointers at this point. */
- if (fuzzy_dirname != dn) {
+ if (fuzzy_dirname != dn
+ && strcmp(fuzzy_dirname, dn) != 0) {
if (fuzzy_dirlist)
flist_free(fuzzy_dirlist);
if (fuzzy_dirlist)
flist_free(fuzzy_dirlist);
- fuzzy_dirname = dn;
- fuzzy_dirlist = get_dirlist(fuzzy_dirname, -1,
- 1);
+ fuzzy_dirlist = get_dirlist(dn, -1, 1);
}
}
+ fuzzy_dirname = dn;
}
statret = link_stat(fname, &st,
}
statret = link_stat(fname, &st,