Mention latest fixes.

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index 34a070c..b6abc2c 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -35,13 +35,13 @@ 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;
 extern int preserve_specials;
 extern int preserve_hard_links;
 extern int preserve_perms;
-extern int preserve_executability;
 extern int preserve_uid;
 extern int preserve_gid;
 extern int preserve_times;
@@ -348,10 +348,9 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
                        iflags |= ITEM_REPORT_SIZE;
                if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time
                     && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
-                   || (keep_time && cmp_modtime(file->modtime, st->st_mtime) != 0))
+                   || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
                        iflags |= ITEM_REPORT_TIME;
-               if ((preserve_perms || preserve_executability)
-                && (file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
+               if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
                        iflags |= ITEM_REPORT_PERMS;
                if (preserve_uid && am_root && file->uid != st->st_uid)
                        iflags |= ITEM_REPORT_OWNER;
@@ -398,7 +397,7 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
        if (ignore_times)
                return 0;
 
-       return cmp_modtime(st->st_mtime, file->modtime) == 0;
+       return cmp_time(st->st_mtime, file->modtime) == 0;
 }
 
 
@@ -558,7 +557,7 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist)
                name = fp->basename;
 
                if (fp->length == file->length
-                   && cmp_modtime(fp->modtime, file->modtime) == 0) {
+                   && cmp_time(fp->modtime, file->modtime) == 0) {
                        if (verbose > 4) {
                                rprintf(FINFO,
                                        "fuzzy size/modtime match for %s\n",
@@ -634,7 +633,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
                        if (!unchanged_attrs(file, stp))
                                continue;
                        if ((always_checksum || ignore_times)
-                        && cmp_modtime(stp->st_mtime, file->modtime))
+                        && cmp_time(stp->st_mtime, file->modtime))
                                continue;
                        best_match = j;
                        match_level = 3;
@@ -772,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;
@@ -789,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;
        }
 
@@ -831,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));
@@ -1075,7 +1086,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
        }
 
        if (update_only && statret == 0
-           && cmp_modtime(st.st_mtime, file->modtime) > 0) {
+           && cmp_time(st.st_mtime, file->modtime) > 0) {
                if (verbose > 1)
                        rprintf(FINFO, "%s is newer\n", fname);
                return;
@@ -1114,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];
@@ -1175,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;
@@ -1233,6 +1244,8 @@ 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 && !delay_updates && !phase)
+           increment_active_files(ndx, itemizing, code);
        write_int(f_out, ndx);
        if (itemizing) {
                int iflags = ITEM_TRANSFER;