X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/6f1c2aab4398d37ddb4686f42ef8568eb0a510b0..232658d9d383c6895dae982e99cf35ddd8f1d6cd:/generator.c diff --git a/generator.c b/generator.c index 1860b0d1..97f4ac77 100644 --- 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; @@ -50,8 +50,6 @@ extern int delete_before; extern int delete_during; extern int delete_after; extern int module_id; -extern int sanitize_paths; -extern int startdir_depth; extern int ignore_errors; extern int remove_sent_files; extern int delay_updates; @@ -360,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); @@ -370,7 +368,7 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st, if (iflags & ITEM_XNAME_FOLLOWS) write_vstring(sock_f_out, xname, strlen(xname)); } else if (ndx >= 0) - log_item(file, &stats, iflags, xname); + log_item(FINFO, file, &stats, iflags, xname); } } @@ -609,14 +607,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); @@ -636,7 +633,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; @@ -647,7 +644,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; @@ -659,8 +655,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, @@ -669,16 +665,16 @@ 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; + code = logfile_format_has_i || dry_run ? FNAME : FINFO; rprintf(code, "%s is uptodate\n", fname); } return -2; } -#endif if (match_level >= 2) { try_a_copy: /* Copy the file locally. */ @@ -695,8 +691,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 = logfile_format_has_i || dry_run ? FNAME : FINFO; rprintf(code, "%s%s\n", fname, match_level == 3 ? " is uptodate" : ""); } @@ -742,9 +737,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) @@ -762,15 +758,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; + code = logfile_format_has_i || dry_run ? FNAME : FINFO; rprintf(code, "%s is uptodate\n", fname); } return -2; @@ -859,7 +855,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 - && do_stat(dn, &st) < 0 + && safe_stat(dn, &st) < 0 && create_directory_path(fname) < 0) { rsyserr(FERROR, errno, "recv_generator: mkdir %s failed", @@ -955,10 +951,6 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } return; } - if (sanitize_paths) { - sanitize_path(file->u.link, file->u.link, "", - startdir_depth + file->dir.depth - 1); - } if (statret == 0) { char lnk[MAXPATHLEN]; int len; @@ -1341,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;