Renamed sum_table -> hash_table.

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index 3a30efd..226f44e 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -27,7 +27,6 @@ extern int verbose;
 extern int dry_run;
 extern int do_xfers;
 extern int log_format_has_i;
-extern int log_format_has_o_or_i;
 extern int daemon_log_format_has_i;
 extern int am_root;
 extern int am_server;
@@ -35,6 +34,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;
@@ -80,7 +80,6 @@ extern int link_dest;
 extern int whole_file;
 extern int list_only;
 extern int read_batch;
-extern int orig_umask;
 extern int safe_symlinks;
 extern long block_size; /* "long" because popt can't set an int32. */
 extern int max_delete;
@@ -770,8 +769,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 int need_fuzzy_dirlist = 0;
        struct file_struct *fuzzy_file = NULL;
        int fd = -1, f_copy = -1;
        STRUCT_STAT st, real_st, partial_st;
@@ -789,12 +789,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                if (fuzzy_dirlist) {
                        flist_free(fuzzy_dirlist);
                        fuzzy_dirlist = NULL;
-                       fuzzy_dirname = "";
                }
                if (missing_below >= 0) {
                        dry_run--;
                        missing_below = -1;
                }
+               parent_dirname = "";
                return;
        }
 
@@ -829,15 +829,27 @@ 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)
-                                       flist_free(fuzzy_dirlist);
-                               fuzzy_dirlist = get_dirlist(dn, -1, 1);
+               char *dn = file->dirname ? file->dirname : ".";
+               if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
+                       if (relative_paths && !implied_dirs
+                        && do_stat(dn, &st) < 0
+                        && create_directory_path(fname) < 0) {
+                               rsyserr(FERROR, errno,
+                                       "recv_generator: mkdir %s failed",
+                                       full_fname(dn));
+                       }
+                       if (fuzzy_dirlist) {
+                               flist_free(fuzzy_dirlist);
+                               fuzzy_dirlist = NULL;
                        }
-                       fuzzy_dirname = dn;
+                       if (fuzzy_basis)
+                               need_fuzzy_dirlist = 1;
+               }
+               parent_dirname = dn;
+
+               if (need_fuzzy_dirlist && S_ISREG(file->mode)) {
+                       fuzzy_dirlist = get_dirlist(dn, -1, 1);
+                       need_fuzzy_dirlist = 0;
                }
 
                statret = link_stat(fname, &st,
@@ -883,7 +895,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                }
                if (statret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
                        if (!relative_paths || errno != ENOENT
-                           || create_directory_path(fname, orig_umask) < 0
+                           || create_directory_path(fname) < 0
                            || (do_mkdir(fname, file->mode) < 0 && errno != EEXIST)) {
                                rsyserr(FERROR, errno,
                                        "recv_generator: mkdir %s failed",
@@ -1112,7 +1124,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 +1185,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 +1243,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) {