X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/398612ba07574d84e51380513c7c3424ac84eef0..b534351058cdb1c4facdd1fc92fb0ef93587b994:/generator.c diff --git a/generator.c b/generator.c index 40159f91..8bdabde7 100644 --- a/generator.c +++ b/generator.c @@ -1,25 +1,25 @@ -/* -*- c-file-style: "linux" -*- - - rsync -- fast file replication program - - Copyright (C) 1996-2000 by Andrew Tridgell - Copyright (C) Paul Mackerras 1996 - Copyright (C) 2002 by Martin Pool - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ +/* + * Routines that are exclusive to the generator process. + * + * Copyright (C) 1996-2000 Andrew Tridgell + * Copyright (C) 1996 Paul Mackerras + * Copyright (C) 2002 Martin Pool + * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + */ #include "rsync.h" @@ -27,7 +27,7 @@ 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 logfile_format_has_i; extern int am_root; extern int am_server; extern int am_daemon; @@ -606,10 +606,15 @@ 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)) @@ -628,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 || ignore_times) + if (always_checksum && preserve_times && cmp_time(stp->st_mtime, file->modtime)) continue; best_match = j; @@ -638,6 +643,8 @@ 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; @@ -648,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, @@ -658,16 +665,17 @@ 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 + code = logfile_format_has_i || dry_run ? FCLIENT : FINFO; rprintf(code, "%s is uptodate\n", fname); } return -2; } -#endif if (match_level >= 2) { try_a_copy: /* Copy the file locally. */ @@ -684,7 +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 + code = logfile_format_has_i || dry_run ? FCLIENT : FINFO; rprintf(code, "%s%s\n", fname, match_level == 3 ? " is uptodate" : ""); @@ -712,7 +720,6 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx, if (link_stat(fnamebuf, &st, 0) < 0 || S_ISDIR(st.st_mode) || !unchanged_attrs(file, &st)) continue; -#ifdef CAN_HARDLINK_SYMLINK if (S_ISLNK(file->mode)) { #ifdef SUPPORT_LINKS char lnk[MAXPATHLEN]; @@ -723,13 +730,27 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx, if (strcmp(lnk, file->u.link) != 0) #endif continue; - } else + } else if (IS_SPECIAL(file->mode)) { + if (!IS_SPECIAL(st.st_mode) || st.st_rdev != file->u.rdev) + continue; + } else if (IS_DEVICE(file->mode)) { + if (!IS_DEVICE(st.st_mode) || st.st_rdev != file->u.rdev) + continue; + } else { + rprintf(FERROR, + "internal: try_dests_non() called with invalid mode (%o)\n", + (int)file->mode); + exit_cleanup(RERR_UNSUPPORTED); + } +#ifdef SUPPORT_HARD_LINKS + if (link_dest +#ifndef CAN_HARDLINK_SYMLINK + && !S_ISLNK(file->mode) #endif - if (IS_DEVICE(st.st_mode) != IS_DEVICE(file->mode) - || IS_SPECIAL(st.st_mode) != IS_SPECIAL(file->mode) - || st.st_rdev != file->u.rdev) - continue; - if (link_dest) { +#ifndef CAN_HARDLINK_SPECIAL + && !IS_SPECIAL(file->mode) && !IS_DEVICE(file->mode) +#endif + ) { if (do_link(fnamebuf, fname) < 0) { rsyserr(FERROR, errno, "failed to hard-link %s with %s", @@ -739,6 +760,7 @@ 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); } +#endif if (itemizing && log_format_has_i && verbose > 1) { int changes = compare_dest ? 0 : ITEM_LOCAL_CHANGE + (link_dest ? ITEM_XNAME_FOLLOWS : 0); @@ -746,7 +768,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx, itemize(file, ndx, 0, &st, changes, 0, lp); } if (verbose > 1 && maybe_ATTRS_REPORT) { - code = daemon_log_format_has_i || dry_run + code = logfile_format_has_i || dry_run ? FCLIENT : FINFO; rprintf(code, "%s is uptodate\n", fname); } @@ -836,7 +858,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", @@ -964,15 +986,18 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, return; if (!S_ISLNK(st.st_mode)) statret = -1; -#ifdef CAN_HARDLINK_SYMLINK } else if (basis_dir[0] != NULL) { if (try_dests_non(file, fname, ndx, itemizing, maybe_ATTRS_REPORT, code) == -2) { +#ifndef CAN_HARDLINK_SYMLINK + if (link_dest) { + /* Resort to --copy-dest behavior. */ + } else +#endif if (!copy_dest) return; itemizing = code = 0; } -#endif } if (preserve_hard_links && file->link_u.links && hard_link_check(file, ndx, fname, -1, &st, @@ -1005,16 +1030,19 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if ((am_root && preserve_devices && IS_DEVICE(file->mode)) || (preserve_specials && IS_SPECIAL(file->mode))) { -#ifdef CAN_HARDLINK_SPECIAL if (statret != 0 && basis_dir[0] != NULL) { if (try_dests_non(file, fname, ndx, itemizing, maybe_ATTRS_REPORT, code) == -2) { +#ifndef CAN_HARDLINK_SPECIAL + if (link_dest) { + /* Resort to --copy-dest behavior. */ + } else +#endif if (!copy_dest) return; itemizing = code = 0; } } -#endif if (statret != 0 || (st.st_mode & ~CHMOD_BITS) != (file->mode & ~CHMOD_BITS) || st.st_rdev != file->u.rdev) { @@ -1309,9 +1337,9 @@ 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; + 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) {