- Got rid of the FNAME logcode enum.

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index 5d1077e..3a8d5eb 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -26,8 +26,8 @@
 extern int verbose;
 extern int dry_run;
 extern int do_xfers;
-extern int log_format_has_i;
-extern int daemon_log_format_has_i;
+extern int stdout_format_has_i;
+extern int logfile_format_has_i;
 extern int am_root;
 extern int am_server;
 extern int am_daemon;
@@ -358,7 +358,7 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
 
        iflags &= 0xffff;
        if ((iflags & SIGNIFICANT_ITEM_FLAGS || verbose > 1
-         || log_format_has_i > 1 || (xname && *xname)) && !read_batch) {
+         || stdout_format_has_i > 1 || (xname && *xname)) && !read_batch) {
                if (protocol_version >= 29) {
                        if (ndx >= 0)
                                write_int(sock_f_out, ndx);
@@ -367,8 +367,10 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
                                write_byte(sock_f_out, fnamecmp_type);
                        if (iflags & ITEM_XNAME_FOLLOWS)
                                write_vstring(sock_f_out, xname, strlen(xname));
-               } else if (ndx >= 0)
-                       log_item(file, &stats, iflags, xname);
+               } else if (ndx >= 0) {
+                       enum logcode code = logfile_format_has_i ? FINFO : FCLIENT;
+                       log_item(code, file, &stats, iflags, xname);
+               }
        }
 }
 
@@ -607,14 +609,13 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
                         int maybe_ATTRS_REPORT, enum logcode code)
 {
        int save_ignore_times = ignore_times;
-       int save_size_only = size_only;
        int best_match = -1;
        int match_level = 0;
        int j = 0;
 
-       /* We can't let these send-affecting options affect our checking
-        * for identical files in the alternate basis dirs. */
-       ignore_times = size_only = 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);
@@ -634,7 +635,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
                case 2:
                        if (!unchanged_attrs(file, stp))
                                continue;
-                       if (always_checksum
+                       if (always_checksum && preserve_times
                         && cmp_time(stp->st_mtime, file->modtime))
                                continue;
                        best_match = j;
@@ -645,7 +646,6 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
        } while (basis_dir[++j] != NULL);
 
        ignore_times = save_ignore_times;
-       size_only = save_size_only;
 
        if (!match_level)
                return -1;
@@ -657,8 +657,8 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
                        match_level = 0;
        }
 
-#ifdef HAVE_LINK
        if (match_level == 3 && !copy_dest) {
+#ifdef SUPPORT_HARD_LINKS
                if (link_dest) {
                        if (hard_link_one(file, ndx, fname, 0, stp,
                                          cmpbuf, 1,
@@ -667,16 +667,15 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
                                goto try_a_copy;
                        if (preserve_hard_links && file->link_u.links)
                                hard_link_cluster(file, ndx, itemizing, code);
-               } else if (itemizing)
+               } else
+#endif
+               if (itemizing)
                        itemize(file, ndx, 0, stp, 0, 0, NULL);
                if (verbose > 1 && maybe_ATTRS_REPORT) {
-                       code = daemon_log_format_has_i || dry_run
-                            ? FCLIENT : FINFO;
-                       rprintf(code, "%s is uptodate\n", fname);
+                       rprintf(FCLIENT, "%s is uptodate\n", fname);
                }
                return -2;
        }
-#endif
 
        if (match_level >= 2) {
          try_a_copy: /* Copy the file locally. */
@@ -693,8 +692,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
                if (maybe_ATTRS_REPORT
                 && ((!itemizing && verbose && match_level == 2)
                  || (verbose > 1 && match_level == 3))) {
-                       code = daemon_log_format_has_i || dry_run
-                            ? FCLIENT : FINFO;
+                       code = match_level == 3 ? FCLIENT : FINFO;
                        rprintf(code, "%s%s\n", fname,
                                match_level == 3 ? " is uptodate" : "");
                }
@@ -740,9 +738,10 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
                } else {
                        rprintf(FERROR,
                                "internal: try_dests_non() called with invalid mode (%o)\n",
-                               file->mode);
+                               (int)file->mode);
                        exit_cleanup(RERR_UNSUPPORTED);
                }
+#ifdef SUPPORT_HARD_LINKS
                if (link_dest
 #ifndef CAN_HARDLINK_SYMLINK
                 && !S_ISLNK(file->mode)
@@ -751,10 +750,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
                 && !IS_SPECIAL(file->mode) && !IS_DEVICE(file->mode)
 #endif
                ) {
-#ifdef SUPPORT_HARD_LINKS
-                       if (do_link(fnamebuf, fname) < 0) 
-#endif
-                       {
+                       if (do_link(fnamebuf, fname) < 0) {
                                rsyserr(FERROR, errno,
                                        "failed to hard-link %s with %s",
                                        fnamebuf, fname);
@@ -763,16 +759,15 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
                        if (preserve_hard_links && file->link_u.links)
                                hard_link_cluster(file, ndx, itemizing, code);
                }
-               if (itemizing && log_format_has_i && verbose > 1) {
+#endif
+               if (itemizing && stdout_format_has_i && verbose > 1) {
                        int changes = compare_dest ? 0 : ITEM_LOCAL_CHANGE
                                    + (link_dest ? ITEM_XNAME_FOLLOWS : 0);
                        char *lp = link_dest ? "" : NULL;
                        itemize(file, ndx, 0, &st, changes, 0, lp);
                }
                if (verbose > 1 && maybe_ATTRS_REPORT) {
-                       code = daemon_log_format_has_i || dry_run
-                            ? FCLIENT : FINFO;
-                       rprintf(code, "%s is uptodate\n", fname);
+                       rprintf(FCLIENT, "%s is uptodate\n", fname);
                }
                return -2;
        } while (basis_dir[++i] != NULL);
@@ -1338,15 +1333,15 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 
        if (protocol_version >= 29) {
                itemizing = 1;
-               maybe_ATTRS_REPORT = log_format_has_i ? 0 : ATTRS_REPORT;
-               code = daemon_log_format_has_i ? 0 : FLOG;
+               maybe_ATTRS_REPORT = stdout_format_has_i ? 0 : ATTRS_REPORT;
+               code = logfile_format_has_i ? 0 : FLOG;
        } else if (am_daemon) {
-               itemizing = daemon_log_format_has_i && do_xfers;
+               itemizing = logfile_format_has_i && do_xfers;
                maybe_ATTRS_REPORT = ATTRS_REPORT;
                code = itemizing || !do_xfers ? FCLIENT : FINFO;
        } else if (!am_server) {
-               itemizing = log_format_has_i;
-               maybe_ATTRS_REPORT = log_format_has_i ? 0 : ATTRS_REPORT;
+               itemizing = stdout_format_has_i;
+               maybe_ATTRS_REPORT = stdout_format_has_i ? 0 : ATTRS_REPORT;
                code = itemizing ? 0 : FINFO;
        } else {
                itemizing = 0;