Renamed fuzzy_dirname -> parent_dirname.

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index 3a30efd..c0e876a 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -35,6 +35,7 @@ extern int am_daemon;
 extern int do_progress;
 extern int recurse;
 extern int relative_paths;
+extern int implied_dirs;
 extern int keep_dirlinks;
 extern int preserve_links;
 extern int preserve_devices;
@@ -770,7 +771,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;
-       static char *fuzzy_dirname = "";
+       static char *parent_dirname = "";
        static struct file_list *fuzzy_dirlist = NULL;
        struct file_struct *fuzzy_file = NULL;
        int fd = -1, f_copy = -1;
@@ -789,7 +790,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                if (fuzzy_dirlist) {
                        flist_free(fuzzy_dirlist);
                        fuzzy_dirlist = NULL;
-                       fuzzy_dirname = "";
+                       parent_dirname = "";
                }
                if (missing_below >= 0) {
                        dry_run--;
@@ -831,13 +832,16 @@ 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 : ".";
-                       if (fuzzy_dirname != dn
-                           && strcmp(fuzzy_dirname, dn) != 0) {
+                       if (parent_dirname != dn
+                           && strcmp(parent_dirname, dn) != 0) {
                                if (fuzzy_dirlist)
                                        flist_free(fuzzy_dirlist);
-                               fuzzy_dirlist = get_dirlist(dn, -1, 1);
+                               if (implied_dirs || stat(dn, &st) == 0)
+                                       fuzzy_dirlist = get_dirlist(dn, -1, 1);
+                               else
+                                       fuzzy_dirlist = NULL;
                        }
-                       fuzzy_dirname = dn;
+                       parent_dirname = dn;
                }
 
                statret = link_stat(fname, &st,
@@ -1112,7 +1116,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
        } else
                partialptr = NULL;
 
-       if (statret != 0 && fuzzy_basis && dry_run <= 1) {
+       if (statret != 0 && fuzzy_dirlist && dry_run <= 1) {
                int j = find_fuzzy(file, fuzzy_dirlist);
                if (j >= 0) {
                        fuzzy_file = fuzzy_dirlist->files[j];
@@ -1173,7 +1177,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
        if (!do_xfers || read_batch || whole_file)
                goto notify_others;
 
-       if (fuzzy_basis) {
+       if (fuzzy_dirlist) {
                int j = flist_find(fuzzy_dirlist, file);
                if (j >= 0) /* don't use changing file as future fuzzy basis */
                        fuzzy_dirlist->files[j]->flags |= FLAG_NO_FUZZY;
@@ -1231,7 +1235,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                rprintf(FINFO, "generating and sending sums for %d\n", ndx);
 
   notify_others:
-       if (remove_sent_files && !phase)
+       if (remove_sent_files && !delay_updates && !phase)
            increment_active_files(ndx, itemizing, code);
        write_int(f_out, ndx);
        if (itemizing) {