Added flag ITEM_MATCHED.

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index ae7c0ea..50d6d88 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -78,6 +78,7 @@ extern int copy_dest;
 extern int link_dest;
 extern int whole_file;
 extern int list_only;
+extern int new_root_dir;
 extern int read_batch;
 extern int safe_symlinks;
 extern long block_size; /* "long" because popt can't set an int32. */
@@ -452,7 +453,7 @@ static void sum_sizes_sqroot(struct sum_struct *sum, int64 len)
                int64 l;
                int b = BLOCKSUM_BIAS;
                for (l = len; l >>= 1; b += 2) {}
-               for (c = blength; c >>= 1 && b; b--) {}
+               for (c = blength; (c >>= 1) && b; b--) {}
                /* add a bit, subtract rollsum, round up. */
                s2length = (b + 1 - 32 + 7) / 8; /* --optimize in compiler-- */
                s2length = MAX(s2length, csum_length);
@@ -607,15 +608,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 +640,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;
 
@@ -653,7 +647,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
                j = best_match;
                pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
                if (link_stat(cmpbuf, stp, 0) < 0)
-                       match_level = 0;
+                       return -1;
        }
 
        if (match_level == 3 && !copy_dest) {
@@ -664,8 +658,11 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
                                          itemizing && verbose > 1,
                                          code) < 0)
                                goto try_a_copy;
-                       if (preserve_hard_links && file->link_u.links)
+                       if (preserve_hard_links && file->link_u.links) {
+                               if (dry_run)
+                                       file->link_u.links->link_dest_used = j + 1;
                                hard_link_cluster(file, ndx, itemizing, code);
+                       }
                } else
 #endif
                if (itemizing)
@@ -859,7 +856,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                char *dn = file->dirname ? file->dirname : ".";
                if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
                        if (relative_paths && !implied_dirs
-                        && safe_stat(dn, &st) < 0
+                        && do_stat(dn, &st) < 0
                         && create_directory_path(fname) < 0) {
                                rsyserr(FERROR, errno,
                                        "recv_generator: mkdir %s failed",
@@ -917,8 +914,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                        dry_run++;
                }
                if (itemizing && f_out != -1) {
-                       itemize(file, ndx, statret, &st,
-                               statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
+                       int sr = statret;
+                       if (new_root_dir) {
+                               if (*fname == '.' && fname[1] == '\0')
+                                       sr = -1;
+                               new_root_dir = 0;
+                       }
+                       itemize(file, ndx, sr, &st,
+                               sr ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
                }
                if (statret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
                        if (!relative_paths || errno != ENOENT
@@ -938,7 +941,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                        }
                }
                if (set_file_attrs(fname, file, statret ? NULL : &st, 0)
-                   && verbose && code && f_out != -1)
+                   && verbose && code != FNONE && f_out != -1)
                        rprintf(code, "%s/\n", fname);
                if (delete_during && f_out != -1 && !phase && dry_run < 2
                    && (file->flags & FLAG_DEL_HERE))
@@ -1007,7 +1010,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 #endif
                                if (!copy_dest)
                                        return;
-                               itemizing = code = 0;
+                               itemizing = 0;
+                               code = FNONE;
                        }
                }
                if (preserve_hard_links && file->link_u.links
@@ -1023,12 +1027,15 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                                itemize(file, ndx, statret, &st,
                                        ITEM_LOCAL_CHANGE, 0, NULL);
                        }
-                       if (code && verbose) {
+                       if (code != FNONE && verbose) {
                                rprintf(code, "%s -> %s\n", fname,
                                        file->u.link);
                        }
                        if (preserve_hard_links && file->link_u.links)
                                hard_link_cluster(file, ndx, itemizing, code);
+                       /* This does not check remove_source_files == 1
+                        * because this is one of the items that the old
+                        * --remove-sent-files option would remove. */
                        if (remove_source_files)
                                goto return_with_success;
                }
@@ -1048,7 +1055,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 #endif
                                if (!copy_dest)
                                        return;
-                               itemizing = code = 0;
+                               itemizing = 0;
+                               code = FNONE;
                        }
                }
                if (statret != 0
@@ -1078,7 +1086,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                                        itemize(file, ndx, statret, &st,
                                                ITEM_LOCAL_CHANGE, 0, NULL);
                                }
-                               if (code && verbose)
+                               if (code != FNONE && verbose)
                                        rprintf(code, "%s\n", fname);
                                if (preserve_hard_links && file->link_u.links) {
                                        hard_link_cluster(file, ndx,
@@ -1154,7 +1162,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                                goto return_with_success;
                        return;
                }
-               if (j != -1) {
+               if (j >= 0) {
                        fnamecmp = fnamecmpbuf;
                        fnamecmp_type = j;
                        statret = 0;
@@ -1360,7 +1368,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
        if (protocol_version >= 29) {
                itemizing = 1;
                maybe_ATTRS_REPORT = stdout_format_has_i ? 0 : ATTRS_REPORT;
-               code = logfile_format_has_i ? 0 : FLOG;
+               code = logfile_format_has_i ? FNONE : FLOG;
        } else if (am_daemon) {
                itemizing = logfile_format_has_i && do_xfers;
                maybe_ATTRS_REPORT = ATTRS_REPORT;
@@ -1368,7 +1376,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
        } else if (!am_server) {
                itemizing = stdout_format_has_i;
                maybe_ATTRS_REPORT = stdout_format_has_i ? 0 : ATTRS_REPORT;
-               code = itemizing ? 0 : FINFO;
+               code = itemizing ? FNONE : FINFO;
        } else {
                itemizing = 0;
                maybe_ATTRS_REPORT = ATTRS_REPORT;