Set a maximum distance-measure that find_fuzzy() will accept.

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index f6949a0..6d239ba 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -66,6 +66,7 @@ extern int always_checksum;
 extern char *partial_dir;
 extern char *basis_dir[];
 extern int compare_dest;
+extern int copy_dest;
 extern int link_dest;
 extern int whole_file;
 extern int local_server;
@@ -203,7 +204,7 @@ static void delete_in_dir(struct file_list *flist, char *fbuf,
 {
        static int min_depth = MAXPATHLEN, cur_depth = -1;
        static void *filt_array[MAXPATHLEN/2+1];
-       static int already_output_warning = 0;
+       static int already_warned = 0;
        struct file_list *dirlist;
        char delbuf[MAXPATHLEN];
        STRUCT_STAT st;
@@ -227,11 +228,11 @@ static void delete_in_dir(struct file_list *flist, char *fbuf,
                return; /* Impossible... */
 
        if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
-               if (already_output_warning)
+               if (already_warned)
                        return;
                rprintf(FINFO,
                        "IO error encountered -- skipping file deletion\n");
-               already_output_warning = 1;
+               already_warned = 1;
                return;
        }
 
@@ -336,6 +337,8 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
        if ((iflags & SIGNIFICANT_ITEM_FLAGS || verbose > 1
          || (xname && *xname)) && !read_batch) {
                if (protocol_version >= 29) {
+                       if (iflags & (ITEM_LOCAL_CHANGE|ITEM_TRANSFER))/* XXX */
+                               iflags |= ITEM_DUMMY_BIT; /* XXX Remove soon */
                        if (ndx >= 0)
                                write_int(sock_f_out, ndx);
                        write_shortint(sock_f_out, iflags);
@@ -504,7 +507,7 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist)
 {
        int fname_len, fname_suf_len;
        const char *fname_suf, *fname = file->basename;
-       uint32 lowest_dist = 0x7FFFFFFF;
+       uint32 lowest_dist = 25 << 16; /* ignore a distance greater than 25 */
        int j, lowest_j = -1;
 
        fname_len = strlen(fname);
@@ -584,7 +587,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 = NULL;
+       static char *fuzzy_dirname = "";
        static struct file_list *fuzzy_dirlist = NULL;
        struct file_struct *fuzzy_file = NULL;
        int fd = -1, f_copy = -1;
@@ -602,7 +605,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 = NULL;
+                       fuzzy_dirname = "";
                }
                if (missing_below >= 0) {
                        dry_run--;
@@ -646,15 +649,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 : ".";
-                       /* 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);
-                               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,
@@ -873,6 +874,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                                        continue;
                                best_match = i;
                                match_level = 2;
+                               if (copy_dest)
+                                       break;
                                /* FALL THROUGH */
                        case 2:
                                if (!unchanged_attrs(file, &st))
@@ -910,7 +913,20 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                                match_level = 2;
                        }
 #endif
-                       if (compare_dest || (match_level && match_level < 3)) {
+                       if (match_level == 2) {
+                               /* Copy the file locally. */
+                               if (copy_file(fnamecmpbuf, fname, file->mode) < 0) {
+                                       if (verbose) {
+                                               rsyserr(FINFO, errno,
+                                                       "copy_file %s => %s",
+                                                       full_fname(fnamecmpbuf),
+                                                       safe_fname(fname));
+                                       }
+                                       match_level = 0;
+                                       statret = -1;
+                               } else
+                                       set_perms(fname, file, NULL, 0);
+                       } else if (compare_dest || match_level == 1) {
                                fnamecmp = fnamecmpbuf;
                                fnamecmp_type = i;
                        }
@@ -973,11 +989,9 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                        return;
                }
                /* Only --compare-dest gets here. */
-               if (unchanged_attrs(file, &st)) {
-                       itemize(file, ndx, real_ret, &real_st,
-                               ITEM_NO_DEST_AND_NO_UPDATE, 0, NULL);
-                       return;
-               }
+               itemize(file, ndx, real_ret, &real_st,
+                       ITEM_NO_DEST_AND_NO_UPDATE, 0, NULL);
+               return;
        }
 
 prepare_to_open:
@@ -1209,9 +1223,18 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 
        write_int(f_out, -1);
 
-       /* Read post-redo-phase MSG_DONE and any prior messages. */
+       /* Read MSG_DONE for the redo phase (and any prior messages). */
        get_redo_num(itemizing, code);
 
+       if (protocol_version >= 29) {
+               phase++;
+               if (verbose > 2)
+                       rprintf(FINFO, "generate_files phase=%d\n", phase);
+               write_int(f_out, -1);
+               /* Read MSG_DONE for delay-update phase & prior messages. */
+               get_redo_num(itemizing, code);
+       }
+
        if (delete_after && !local_name && flist->count > 0)
                do_delete_pass(flist);
 
@@ -1227,9 +1250,8 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
                                continue;
                        if (!need_retouch_dir_times && file->mode & S_IWUSR)
                                continue;
-                       recv_generator(local_name ? local_name : f_name(file),
-                                      file, i, itemizing, maybe_PERMS_REPORT,
-                                      code, -1);
+                       recv_generator(f_name(file), file, i, itemizing,
+                                      maybe_PERMS_REPORT, code, -1);
                        if (allowed_lull && !(j++ % lull_mod))
                                maybe_send_keepalive();
                }