Mention latest fixes.

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index 5577624..b6abc2c 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,8 +771,9 @@ 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;
+       static struct file_list *need_dirlist = (struct file_list *)"";
        struct file_struct *fuzzy_file = NULL;
        int fd = -1, f_copy = -1;
        STRUCT_STAT st, real_st, partial_st;
@@ -787,14 +789,15 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 
        if (!fname) {
                if (fuzzy_dirlist) {
-                       flist_free(fuzzy_dirlist);
+                       if (fuzzy_dirlist != need_dirlist)
+                               flist_free(fuzzy_dirlist);
                        fuzzy_dirlist = NULL;
-                       fuzzy_dirname = "";
                }
                if (missing_below >= 0) {
                        dry_run--;
                        missing_below = -1;
                }
+               parent_dirname = "";
                return;
        }
 
@@ -829,16 +832,26 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                statret = -1;
                stat_errno = ENOENT;
        } else {
-               if (fuzzy_basis && S_ISREG(file->mode)) {
-                       char *dn = file->dirname ? file->dirname : ".";
-                       if (fuzzy_dirname != dn
-                           && strcmp(fuzzy_dirname, dn) != 0) {
-                               if (fuzzy_dirlist)
+               char *dn = file->dirname ? file->dirname : ".";
+               if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
+                       if (relative_paths && !implied_dirs && stat(dn, &st) < 0
+                        && create_directory_path(fname, orig_umask) < 0) {
+                               rsyserr(FERROR, errno,
+                                       "recv_generator: mkdir %s failed",
+                                       full_fname(dn));
+                       }
+                       if (fuzzy_dirlist) {
+                               if (fuzzy_dirlist != need_dirlist)
                                        flist_free(fuzzy_dirlist);
-                               fuzzy_dirlist = get_dirlist(dn, -1, 1);
+                               fuzzy_dirlist = NULL;
                        }
-                       fuzzy_dirname = dn;
+                       if (fuzzy_basis)
+                               fuzzy_dirlist = need_dirlist;
                }
+               parent_dirname = dn;
+
+               if (fuzzy_dirlist == need_dirlist && S_ISREG(file->mode))
+                       fuzzy_dirlist = get_dirlist(dn, -1, 1);
 
                statret = link_stat(fname, &st,
                                    keep_dirlinks && S_ISDIR(file->mode));
@@ -1112,7 +1125,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 +1186,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;