I decided that combining --link-dest with -I doesn't make much sense

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index 470720a..b36bc4d 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -50,7 +50,7 @@ extern int delete_during;
 extern int delete_after;
 extern int module_id;
 extern int ignore_errors;
-extern int remove_sender_files;
+extern int remove_source_files;
 extern int delay_updates;
 extern int update_only;
 extern int ignore_existing;
@@ -607,15 +607,10 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
                         char *cmpbuf, STRUCT_STAT *stp, int itemizing,
                         int maybe_ATTRS_REPORT, enum logcode code)
 {
-       int save_ignore_times = ignore_times;
        int best_match = -1;
        int match_level = 0;
        int j = 0;
 
-       /* We can't let ignore_times affect the unchanged_file() test in
-        * an alternate-dest dir or we will never find any matches. */
-       ignore_times = 0;
-
        do {
                pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
                if (link_stat(cmpbuf, stp, 0) < 0 || !S_ISREG(stp->st_mode))
@@ -644,8 +639,6 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
                break;
        } while (basis_dir[++j] != NULL);
 
-       ignore_times = save_ignore_times;
-
        if (!match_level)
                return -1;
 
@@ -986,7 +979,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                                                                  itemizing,
                                                                  code);
                                        }
-                                       if (remove_sender_files == 1)
+                                       if (remove_source_files == 1)
                                                goto return_with_success;
                                        return;
                                }
@@ -1029,7 +1022,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                        }
                        if (preserve_hard_links && file->link_u.links)
                                hard_link_cluster(file, ndx, itemizing, code);
-                       if (remove_sender_files)
+                       if (remove_source_files)
                                goto return_with_success;
                }
 #endif
@@ -1084,7 +1077,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                                        hard_link_cluster(file, ndx,
                                                          itemizing, code);
                                }
-                               if (remove_sender_files == 1)
+                               if (remove_source_files == 1)
                                        goto return_with_success;
                        }
                } else {
@@ -1093,7 +1086,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                        set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
                        if (preserve_hard_links && file->link_u.links)
                                hard_link_cluster(file, ndx, itemizing, code);
-                       if (remove_sender_files == 1)
+                       if (remove_source_files == 1)
                                goto return_with_success;
                }
                return;
@@ -1150,11 +1143,11 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &st,
                                      itemizing, maybe_ATTRS_REPORT, code);
                if (j == -2) {
-                       if (remove_sender_files == 1)
+                       if (remove_source_files == 1)
                                goto return_with_success;
                        return;
                }
-               if (j != -1) {
+               if (j >= 0) {
                        fnamecmp = fnamecmpbuf;
                        fnamecmp_type = j;
                        statret = 0;
@@ -1219,7 +1212,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
                if (preserve_hard_links && file->link_u.links)
                        hard_link_cluster(file, ndx, itemizing, code);
-               if (remove_sender_files != 1)
+               if (remove_source_files != 1)
                        return;
          return_with_success:
                if (!dry_run) {
@@ -1299,7 +1292,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_sender_files && !delay_updates && !phase)
+       if (remove_source_files && !delay_updates && !phase)
                increment_active_files(ndx, itemizing, code);
        write_int(f_out, ndx);
        if (itemizing) {