X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a9d6e6fcacf363b25023aeec3c8d706714ebebcd..e7c67065c060d500eba8d073da9568db2c658aad:/generator.c diff --git a/generator.c b/generator.c index 4db5cbac..26970cea 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,6 @@ extern int verbose; extern int dry_run; extern int do_xfers; extern int log_format_has_i; -extern int log_format_has_o_or_i; extern int daemon_log_format_has_i; extern int am_root; extern int am_server; @@ -35,6 +34,7 @@ extern int am_daemon; extern int do_progress; extern int recurse; extern int relative_paths; +extern int implied_dirs; extern int keep_dirlinks; extern int preserve_links; extern int preserve_devices; @@ -80,7 +80,6 @@ extern int link_dest; extern int whole_file; extern int list_only; extern int read_batch; -extern int orig_umask; extern int safe_symlinks; extern long block_size; /* "long" because popt can't set an int32. */ extern int max_delete; @@ -95,8 +94,6 @@ extern struct file_list *the_file_list; extern struct filter_list_struct server_filter_list; static int deletion_count = 0; /* used to implement --max-delete */ -static int can_link_symlinks = 1; /* start out optimistic */ -static int can_link_devices = 1; /* For calling delete_file() */ #define DEL_FORCE_RECURSE (1<<1) /* recurse even w/o --force */ @@ -347,10 +344,9 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st, iflags |= ITEM_REPORT_SIZE; if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname)) - || (keep_time && cmp_modtime(file->modtime, st->st_mtime) != 0)) + || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0)) iflags |= ITEM_REPORT_TIME; - if (preserve_perms - && (file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS)) + if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS)) iflags |= ITEM_REPORT_PERMS; if (preserve_uid && am_root && file->uid != st->st_uid) iflags |= ITEM_REPORT_OWNER; @@ -397,7 +393,7 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st) if (ignore_times) return 0; - return cmp_modtime(st->st_mtime, file->modtime) == 0; + return cmp_time(st->st_mtime, file->modtime) == 0; } @@ -557,7 +553,7 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist) name = fp->basename; if (fp->length == file->length - && cmp_modtime(fp->modtime, file->modtime) == 0) { + && cmp_time(fp->modtime, file->modtime) == 0) { if (verbose > 4) { rprintf(FINFO, "fuzzy size/modtime match for %s\n", @@ -633,7 +629,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, if (!unchanged_attrs(file, stp)) continue; if ((always_checksum || ignore_times) - && cmp_modtime(stp->st_mtime, file->modtime)) + && cmp_time(stp->st_mtime, file->modtime)) continue; best_match = j; match_level = 3; @@ -704,12 +700,12 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, /* This is only called for non-regular files. We return -2 if we've finished * handling the file, or -1 if no dest-linking occurred. */ static int try_dests_non(struct file_struct *file, char *fname, int ndx, - int itemizing, int *possible_ptr, - int maybe_ATTRS_REPORT, enum logcode code) + int itemizing, int maybe_ATTRS_REPORT, + enum logcode code) { - char fnamebuf[MAXPATHLEN], lnk[MAXPATHLEN]; + char fnamebuf[MAXPATHLEN]; STRUCT_STAT st; - int len, i = 0; + int i = 0; do { pathjoin(fnamebuf, MAXPATHLEN, basis_dir[i], fname); @@ -718,20 +714,38 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx, continue; if (S_ISLNK(file->mode)) { #ifdef SUPPORT_LINKS + char lnk[MAXPATHLEN]; + int len; if ((len = readlink(fnamebuf, lnk, MAXPATHLEN-1)) <= 0) continue; lnk[len] = '\0'; 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", + file->mode); + exit_cleanup(RERR_UNSUPPORTED); } - if (link_dest) { + if (link_dest +#ifndef CAN_HARDLINK_SYMLINK + && !S_ISLNK(file->mode) +#endif +#ifndef CAN_HARDLINK_SPECIAL + && !IS_SPECIAL(file->mode) && !IS_DEVICE(file->mode) +#endif + ) { if (do_link(fnamebuf, fname) < 0) { - /* TODO improve this to be based on errno? */ - *possible_ptr = 0; + rsyserr(FERROR, errno, + "failed to hard-link %s with %s", + fnamebuf, fname); break; } if (preserve_hard_links && file->link_u.links) @@ -771,8 +785,9 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, enum logcode code, int f_out) { static int missing_below = -1, excluded_below = -1; - static char *fuzzy_dirname = ""; + static char *parent_dirname = ""; static struct file_list *fuzzy_dirlist = NULL; + static int need_fuzzy_dirlist = 0; struct file_struct *fuzzy_file = NULL; int fd = -1, f_copy = -1; STRUCT_STAT st, real_st, partial_st; @@ -790,12 +805,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (fuzzy_dirlist) { flist_free(fuzzy_dirlist); fuzzy_dirlist = NULL; - fuzzy_dirname = ""; } if (missing_below >= 0) { dry_run--; missing_below = -1; } + parent_dirname = ""; return; } @@ -830,15 +845,27 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, statret = -1; stat_errno = ENOENT; } else { - if (fuzzy_basis && S_ISREG(file->mode)) { - char *dn = file->dirname ? file->dirname : "."; - if (fuzzy_dirname != dn - && strcmp(fuzzy_dirname, dn) != 0) { - if (fuzzy_dirlist) - flist_free(fuzzy_dirlist); - fuzzy_dirlist = get_dirlist(dn, -1, 1); + 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 + && create_directory_path(fname) < 0) { + rsyserr(FERROR, errno, + "recv_generator: mkdir %s failed", + full_fname(dn)); + } + if (fuzzy_dirlist) { + flist_free(fuzzy_dirlist); + fuzzy_dirlist = NULL; } - fuzzy_dirname = dn; + if (fuzzy_basis) + need_fuzzy_dirlist = 1; + } + parent_dirname = dn; + + if (need_fuzzy_dirlist && S_ISREG(file->mode)) { + fuzzy_dirlist = get_dirlist(dn, -1, 1); + need_fuzzy_dirlist = 0; } statret = link_stat(fname, &st, @@ -884,7 +911,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } if (statret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) { if (!relative_paths || errno != ENOENT - || create_directory_path(fname, orig_umask) < 0 + || create_directory_path(fname) < 0 || (do_mkdir(fname, file->mode) < 0 && errno != EEXIST)) { rsyserr(FERROR, errno, "recv_generator: mkdir %s failed", @@ -949,10 +976,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, return; if (!S_ISLNK(st.st_mode)) statret = -1; - } else if (basis_dir[0] != NULL && can_link_symlinks) { + } else if (basis_dir[0] != NULL) { if (try_dests_non(file, fname, ndx, itemizing, - &can_link_symlinks, 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; @@ -989,11 +1020,14 @@ 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))) { - if (statret != 0 - && (basis_dir[0] != NULL && can_link_devices)) { + if (statret != 0 && basis_dir[0] != NULL) { if (try_dests_non(file, fname, ndx, itemizing, - &can_link_devices, 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; @@ -1074,7 +1108,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } if (update_only && statret == 0 - && cmp_modtime(st.st_mtime, file->modtime) > 0) { + && cmp_time(st.st_mtime, file->modtime) > 0) { if (verbose > 1) rprintf(FINFO, "%s is newer\n", fname); return; @@ -1113,7 +1147,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } else partialptr = NULL; - if (statret != 0 && fuzzy_basis && dry_run <= 1) { + if (statret != 0 && fuzzy_dirlist && dry_run <= 1) { int j = find_fuzzy(file, fuzzy_dirlist); if (j >= 0) { fuzzy_file = fuzzy_dirlist->files[j]; @@ -1174,7 +1208,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (!do_xfers || read_batch || whole_file) goto notify_others; - if (fuzzy_basis) { + if (fuzzy_dirlist) { int j = flist_find(fuzzy_dirlist, file); if (j >= 0) /* don't use changing file as future fuzzy basis */ fuzzy_dirlist->files[j]->flags |= FLAG_NO_FUZZY; @@ -1232,6 +1266,8 @@ 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_sent_files && !delay_updates && !phase) + increment_active_files(ndx, itemizing, code); write_int(f_out, ndx); if (itemizing) { int iflags = ITEM_TRANSFER; @@ -1286,6 +1322,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) int save_ignore_non_existing = ignore_non_existing; int save_do_progress = do_progress; int save_make_backups = make_backups; + int dir_tweaking = !(list_only || local_name || dry_run); if (protocol_version >= 29) { itemizing = 1; @@ -1347,7 +1384,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) * them. This is then fixed after the transfer is done. */ #ifdef HAVE_CHMOD if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR) - && !list_only) { + && dir_tweaking) { mode_t mode = file->mode | S_IWUSR; /* user write */ char *fname = local_name ? local_name : fbuf; if (do_chmod(fname, mode) < 0) { @@ -1427,8 +1464,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) if (delete_after && !local_name && flist->count > 0) do_delete_pass(flist); - if ((need_retouch_dir_perms || need_retouch_dir_times) - && !list_only && !local_name && !dry_run) { + if ((need_retouch_dir_perms || need_retouch_dir_times) && dir_tweaking) { int j = 0; /* Now we need to fix any directory permissions that were * modified during the transfer and/or re-set any tweaked