X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/967866d4df4009bdc32347f7fa085681129a92c9..5e4ff5f9c58c2b84ef32d43e542a8fa12b64bc65:/generator.c diff --git a/generator.c b/generator.c index cbfb114f..82040c1a 100644 --- a/generator.c +++ b/generator.c @@ -25,12 +25,14 @@ 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; extern int am_daemon; +extern int do_progress; extern int recurse; extern int relative_paths; extern int keep_dirlinks; @@ -48,31 +50,34 @@ extern int delete_after; extern int module_id; extern int ignore_errors; extern int remove_sent_files; +extern int delay_updates; extern int update_only; -extern int opt_ignore_existing; +extern int ignore_existing; +extern int ignore_non_existing; extern int inplace; +extern int append_mode; extern int make_backups; extern int csum_length; extern int ignore_times; extern int size_only; extern OFF_T max_size; -extern int io_timeout; +extern OFF_T min_size; extern int io_error; +extern int allowed_lull; extern int sock_f_out; extern int ignore_timeout; extern int protocol_version; extern int fuzzy_basis; extern int always_checksum; +extern int checksum_len; extern char *partial_dir; extern char *basis_dir[]; extern int compare_dest; extern int copy_dest; extern int link_dest; extern int whole_file; -extern int local_server; extern int list_only; extern int read_batch; -extern int only_existing; extern int orig_umask; extern int safe_symlinks; extern long block_size; /* "long" because popt can't set an int32. */ @@ -87,9 +92,13 @@ extern int backup_suffix_len; extern struct file_list *the_file_list; extern struct filter_list_struct server_filter_list; -int allowed_lull = 0; - 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 */ +#define DEL_TERSE (1<<3) static int is_backup_file(char *fn) @@ -100,14 +109,18 @@ static int is_backup_file(char *fn) /* Delete a file or directory. If DEL_FORCE_RECURSE is set in the flags, or if - * force_delete is set, this will delete recursively as long as DEL_NO_RECURSE - * is not set in the flags. */ + * force_delete is set, this will delete recursively. + * + * Note that fname must point to a MAXPATHLEN buffer if the mode indicates it's + * a directory! (The buffer is used for recursion, but returned unchanged.) + */ static int delete_item(char *fname, int mode, int flags) { struct file_list *dirlist; - char buf[MAXPATHLEN]; int j, dlen, zap_dir, ok; + unsigned remainder; void *save_filters; + char *p; if (!S_ISDIR(mode)) { if (max_delete && ++deletion_count > max_delete) @@ -130,8 +143,7 @@ static int delete_item(char *fname, int mode, int flags) return -1; } - zap_dir = (flags & DEL_FORCE_RECURSE || (force_delete && recurse)) - && !(flags & DEL_NO_RECURSE); + zap_dir = flags & DEL_FORCE_RECURSE || (force_delete && recurse); if ((max_delete && ++deletion_count > max_delete) || (dry_run && zap_dir)) { ok = 0; @@ -150,7 +162,7 @@ static int delete_item(char *fname, int mode, int flags) deletion_count--; return 0; } - if (!zap_dir || (errno != ENOTEMPTY && errno != EEXIST)) { + if (!zap_dir) { rsyserr(FERROR, errno, "delete_file: rmdir %s failed", full_fname(fname)); return -1; @@ -158,24 +170,29 @@ static int delete_item(char *fname, int mode, int flags) flags |= DEL_FORCE_RECURSE; /* mark subdir dels as not "in the way" */ deletion_count--; - dlen = strlcpy(buf, fname, MAXPATHLEN); - save_filters = push_local_filters(buf, dlen); + dlen = strlen(fname); + save_filters = push_local_filters(fname, dlen); + + dirlist = get_dirlist(fname, dlen, 0); + + p = fname + dlen; + if (dlen != 1 || *fname != '/') + *p++ = '/'; + remainder = MAXPATHLEN - (p - fname); - dirlist = get_dirlist(buf, dlen, 0); for (j = dirlist->count; j--; ) { struct file_struct *fp = dirlist->files[j]; if (fp->flags & FLAG_MOUNT_POINT) continue; - f_name_to(fp, buf); - if (delete_item(buf, fp->mode, flags & ~DEL_TERSE) != 0) { - flist_free(dirlist); - return -1; - } + strlcpy(p, fp->basename, remainder); + delete_item(fname, fp->mode, flags & ~DEL_TERSE); } flist_free(dirlist); + fname[dlen] = '\0'; + pop_local_filters(save_filters); if (max_delete && ++deletion_count > max_delete) @@ -184,7 +201,7 @@ static int delete_item(char *fname, int mode, int flags) if (do_rmdir(fname) == 0) { if (!(flags & DEL_TERSE)) log_delete(fname, mode); - } else if (errno != ENOTEMPTY && errno != ENOENT) { + } else if (errno != ENOTEMPTY && errno != EEXIST && errno != ENOENT) { rsyserr(FERROR, errno, "delete_file: rmdir %s failed", full_fname(fname)); return -1; @@ -204,7 +221,7 @@ static void delete_in_dir(struct file_list *flist, char *fbuf, { static int min_depth = MAXPATHLEN, cur_depth = -1; static void *filt_array[MAXPATHLEN/2+1]; - static int already_output_warning = 0; + static int already_warned = 0; struct file_list *dirlist; char delbuf[MAXPATHLEN]; STRUCT_STAT st; @@ -219,7 +236,7 @@ static void delete_in_dir(struct file_list *flist, char *fbuf, } if (verbose > 2) - rprintf(FINFO, "delete_in_dir(%s)\n", safe_fname(fbuf)); + rprintf(FINFO, "delete_in_dir(%s)\n", fbuf); if (allowed_lull) maybe_send_keepalive(); @@ -228,11 +245,11 @@ static void delete_in_dir(struct file_list *flist, char *fbuf, return; /* Impossible... */ if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) { - if (already_output_warning) + if (already_warned) return; rprintf(FINFO, "IO error encountered -- skipping file deletion\n"); - already_output_warning = 1; + already_warned = 1; return; } @@ -247,21 +264,25 @@ static void delete_in_dir(struct file_list *flist, char *fbuf, if (link_stat(fbuf, &st, keep_dirlinks) < 0) return; - if (one_file_system && file->flags & FLAG_TOP_DIR) - filesystem_dev = st.st_dev; + if (one_file_system) { + if (file->flags & FLAG_TOP_DIR) + filesystem_dev = st.st_dev; + else if (filesystem_dev != st.st_dev) + return; + } dirlist = get_dirlist(fbuf, dlen, 0); /* If an item in dirlist is not found in flist, delete it * from the filesystem. */ for (i = dirlist->count; i--; ) { - if (!dirlist->files[i]->basename) + struct file_struct *fp = dirlist->files[i]; + if (!fp->basename || fp->flags & FLAG_MOUNT_POINT) continue; - if (flist_find(flist, dirlist->files[i]) < 0) { - int mode = dirlist->files[i]->mode; - f_name_to(dirlist->files[i], delbuf); - if (delete_item(delbuf, mode, DEL_FORCE_RECURSE) < 0) - break; + if (flist_find(flist, fp) < 0) { + int mode = fp->mode; + f_name_to(fp, delbuf); + delete_item(delbuf, mode, DEL_FORCE_RECURSE); } } @@ -275,7 +296,8 @@ static void do_delete_pass(struct file_list *flist) char fbuf[MAXPATHLEN]; int j; - if (dry_run > 1) /* destination doesn't exist yet */ + if (dry_run > 1 /* destination doesn't exist yet */ + || list_only) return; for (j = 0; j < flist->count; j++) { @@ -286,13 +308,17 @@ static void do_delete_pass(struct file_list *flist) f_name_to(file, fbuf); if (verbose > 1 && file->flags & FLAG_TOP_DIR) - rprintf(FINFO, "deleting in %s\n", safe_fname(fbuf)); + rprintf(FINFO, "deleting in %s\n", fbuf); delete_in_dir(flist, fbuf, file); } + delete_in_dir(NULL, NULL, NULL); + + if (do_progress && !am_server) + rprintf(FINFO, " \r"); } -static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st) +int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st) { if (preserve_perms && (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) @@ -307,29 +333,28 @@ static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st) return 1; } - void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st, int32 iflags, uchar fnamecmp_type, char *xname) { - if (statret == 0) { + if (statret >= 0) { /* A from-dest-dir statret can == 1! */ + int keep_time = !preserve_times ? 0 + : S_ISDIR(file->mode) ? !omit_dir_times + : !S_ISLNK(file->mode); + if (S_ISREG(file->mode) && file->length != st->st_size) iflags |= ITEM_REPORT_SIZE; - if (!(iflags & ITEM_NO_DEST_AND_NO_UPDATE)) { - int keep_time = !preserve_times ? 0 - : S_ISDIR(file->mode) ? !omit_dir_times - : !S_ISLNK(file->mode); - - if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time) - || (keep_time && file->modtime != st->st_mtime)) - iflags |= ITEM_REPORT_TIME; - if (preserve_perms && file->mode != st->st_mode) - iflags |= ITEM_REPORT_PERMS; - if (preserve_uid && am_root && file->uid != st->st_uid) - iflags |= ITEM_REPORT_OWNER; - if (preserve_gid && file->gid != GID_NONE - && st->st_gid != file->gid) - iflags |= ITEM_REPORT_GROUP; - } + if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time + && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname)) + || (keep_time && cmp_modtime(file->modtime, st->st_mtime) != 0)) + iflags |= ITEM_REPORT_TIME; + if (preserve_perms + && (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; + if (preserve_gid && file->gid != GID_NONE + && st->st_gid != file->gid) + iflags |= ITEM_REPORT_GROUP; } else iflags |= ITEM_IS_NEW; @@ -351,7 +376,7 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st, /* Perform our quick-check heuristic for determining if a file is unchanged. */ -static int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st) +int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st) { if (st->st_size != file->length) return 0; @@ -361,8 +386,7 @@ static int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st) if (always_checksum && S_ISREG(st->st_mode)) { char sum[MD4_SUM_LENGTH]; file_checksum(fn, sum, st->st_size); - return memcmp(sum, file->u.sum, protocol_version < 21 ? 2 - : MD4_SUM_LENGTH) == 0; + return memcmp(sum, file->u.sum, checksum_len) == 0; } if (size_only) @@ -439,8 +463,8 @@ static void sum_sizes_sqroot(struct sum_struct *sum, int64 len) sum->flength = len; sum->blength = blength; sum->s2length = s2length; - sum->count = (len + (blength - 1)) / blength; - sum->remainder = (len % blength); + sum->remainder = len % blength; + sum->count = len / blength + (sum->remainder != 0); if (sum->count && verbose > 2) { rprintf(FINFO, @@ -464,35 +488,42 @@ static void generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy) OFF_T offset = 0; sum_sizes_sqroot(&sum, len); + write_sum_head(f_out, &sum); + + if (append_mode > 0 && f_copy < 0) + return; if (len > 0) mapbuf = map_file(fd, len, MAX_MAP_SIZE, sum.blength); else mapbuf = NULL; - write_sum_head(f_out, &sum); - for (i = 0; i < sum.count; i++) { int32 n1 = (int32)MIN(len, (OFF_T)sum.blength); char *map = map_ptr(mapbuf, offset, n1); - uint32 sum1 = get_checksum1(map, n1); char sum2[SUM_LENGTH]; + uint32 sum1; + + len -= n1; + offset += n1; - if (f_copy >= 0) + if (f_copy >= 0) { full_write(f_copy, map, n1); + if (append_mode > 0) + continue; + } + sum1 = get_checksum1(map, n1); get_checksum2(map, n1, sum2); if (verbose > 3) { rprintf(FINFO, "chunk[%.0f] offset=%.0f len=%ld sum1=%08lx\n", - (double)i, (double)offset, (long)n1, + (double)i, (double)offset - n1, (long)n1, (unsigned long)sum1); } write_int(f_out, sum1); write_buf(f_out, sum2, sum.s2length); - len -= n1; - offset += n1; } if (mapbuf) @@ -505,7 +536,7 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist) { int fname_len, fname_suf_len; const char *fname_suf, *fname = file->basename; - uint32 lowest_dist = 0x7FFFFFFF; + uint32 lowest_dist = 25 << 16; /* ignore a distance greater than 25 */ int j, lowest_j = -1; fname_len = strlen(fname); @@ -524,7 +555,7 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist) name = fp->basename; if (fp->length == file->length - && fp->modtime == file->modtime) { + && cmp_modtime(fp->modtime, file->modtime) == 0) { if (verbose > 4) { rprintf(FINFO, "fuzzy size/modtime match for %s\n", @@ -570,6 +601,155 @@ void check_for_finished_hlinks(int itemizing, enum logcode code) } } +/* This is only called for regular files. We return -2 if we've finished + * handling the file, -1 if no dest-linking occurred, or a non-negative + * value if we found an alternate basis file. */ +static int try_dests_reg(struct file_struct *file, char *fname, int ndx, + char *cmpbuf, STRUCT_STAT *stp, int itemizing, + int maybe_PERMS_REPORT, enum logcode code) +{ + int best_match = -1; + int match_level = 0; + int j = 0; + + do { + pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname); + if (link_stat(cmpbuf, stp, 0) < 0 || !S_ISREG(stp->st_mode)) + continue; + switch (match_level) { + case 0: + best_match = j; + match_level = 1; + /* FALL THROUGH */ + case 1: + if (!unchanged_file(cmpbuf, file, stp)) + continue; + best_match = j; + match_level = 2; + /* FALL THROUGH */ + case 2: + if (!unchanged_attrs(file, stp)) + continue; + if ((always_checksum || ignore_times) + && cmp_modtime(stp->st_mtime, file->modtime)) + continue; + best_match = j; + match_level = 3; + break; + } + break; + } while (basis_dir[++j] != NULL); + + if (!match_level) + return -1; + + if (j != best_match) { + j = best_match; + pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname); + if (link_stat(cmpbuf, stp, 0) < 0) + match_level = 0; + } + +#ifdef HAVE_LINK + if (match_level == 3 && !copy_dest) { + if (link_dest) { + if (hard_link_one(file, ndx, fname, 0, stp, + cmpbuf, 1, + itemizing && verbose > 1, + code) < 0) + goto try_a_copy; + if (preserve_hard_links && file->link_u.links) + hard_link_cluster(file, ndx, itemizing, code); + } else if (itemizing) + itemize(file, ndx, 0, stp, 0, 0, NULL); + if (verbose > 1 && maybe_PERMS_REPORT) { + code = daemon_log_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. */ + if (copy_file(cmpbuf, fname, file->mode) < 0) { + if (verbose) { + rsyserr(FINFO, errno, "copy_file %s => %s", + full_fname(cmpbuf), fname); + } + return -1; + } + if (itemizing) + itemize(file, ndx, 0, stp, ITEM_LOCAL_CHANGE, 0, NULL); + set_perms(fname, file, NULL, 0); + if (maybe_PERMS_REPORT + && ((!itemizing && verbose && match_level == 2) + || (verbose > 1 && match_level == 3))) { + code = daemon_log_format_has_i || dry_run + ? FCLIENT : FINFO; + rprintf(code, "%s%s\n", fname, + match_level == 3 ? " is uptodate" : ""); + } + if (preserve_hard_links && file->link_u.links) + hard_link_cluster(file, ndx, itemizing, code); + return -2; + } + + return FNAMECMP_BASIS_DIR_LOW + j; +} + +/* 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_PERMS_REPORT, enum logcode code) +{ + char fnamebuf[MAXPATHLEN], lnk[MAXPATHLEN]; + STRUCT_STAT st; + int len, i = 0; + + do { + pathjoin(fnamebuf, MAXPATHLEN, basis_dir[i], fname); + if (link_stat(fnamebuf, &st, 0) < 0 || S_ISDIR(st.st_mode) + || !unchanged_attrs(file, &st)) + continue; + if (S_ISLNK(file->mode)) { + if ((len = readlink(fnamebuf, lnk, MAXPATHLEN-1)) <= 0) + continue; + lnk[len] = '\0'; + if (strcmp(lnk, file->u.link) != 0) + continue; + } else { + if (!IS_DEVICE(st.st_mode) || st.st_rdev != file->u.rdev) + continue; + } + if (link_dest) { + if (do_link(fnamebuf, fname) < 0) { + /* TODO improve this to be based on errno? */ + *possible_ptr = 0; + break; + } + if (preserve_hard_links && file->link_u.links) + hard_link_cluster(file, ndx, itemizing, code); + } + if (itemizing && log_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_PERMS_REPORT) { + code = daemon_log_format_has_i || dry_run + ? FCLIENT : FINFO; + rprintf(code, "%s is uptodate\n", fname); + } + return -2; + } while (basis_dir[++i] != NULL); + + return -1; +} + static int phase = 0; /* Acts on the_file_list->file's ndx'th item, whose name is fname. If a dir, @@ -578,6 +758,8 @@ static int phase = 0; * regular files that have changed, we try to find a basis file and then * start sending checksums. * + * When fname is non-null, it must point to a MAXPATHLEN buffer! + * * Note that f_out is set to -1 when doing final directory-permission and * modification-time repair. */ static void recv_generator(char *fname, struct file_struct *file, int ndx, @@ -585,7 +767,7 @@ 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 = NULL; + static char *fuzzy_dirname = ""; static struct file_list *fuzzy_dirlist = NULL; struct file_struct *fuzzy_file = NULL; int fd = -1, f_copy = -1; @@ -603,7 +785,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (fuzzy_dirlist) { flist_free(fuzzy_dirlist); fuzzy_dirlist = NULL; - fuzzy_dirname = NULL; + fuzzy_dirname = ""; } if (missing_below >= 0) { dry_run--; @@ -612,10 +794,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, return; } - if (verbose > 2) { - rprintf(FINFO, "recv_generator(%s,%d)\n", - safe_fname(fname), ndx); - } + if (verbose > 2) + rprintf(FINFO, "recv_generator(%s,%d)\n", fname, ndx); if (server_filter_list.head) { if (excluded_below >= 0) { @@ -627,11 +807,11 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, S_ISDIR(file->mode)) < 0) { if (S_ISDIR(file->mode)) excluded_below = file->dir.depth; - skipping: + skipping: if (verbose) { rprintf(FINFO, "skipping server-excluded file \"%s\"\n", - safe_fname(fname)); + fname); } return; } @@ -647,15 +827,13 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } else { if (fuzzy_basis && S_ISREG(file->mode)) { char *dn = file->dirname ? file->dirname : "."; - /* Yes, identical dirnames are guaranteed to have - * identical pointers at this point. */ - if (fuzzy_dirname != dn) { + if (fuzzy_dirname != dn + && strcmp(fuzzy_dirname, dn) != 0) { if (fuzzy_dirlist) flist_free(fuzzy_dirlist); - fuzzy_dirname = dn; - fuzzy_dirlist = get_dirlist(fuzzy_dirname, -1, - 1); + fuzzy_dirlist = get_dirlist(dn, -1, 1); } + fuzzy_dirname = dn; } statret = link_stat(fname, &st, @@ -663,11 +841,11 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, stat_errno = errno; } - if (only_existing && statret == -1 && stat_errno == ENOENT) { - /* we only want to update existing files */ + if (ignore_non_existing && statret == -1 && stat_errno == ENOENT) { if (verbose > 1) { - rprintf(FINFO, "not creating new file \"%s\"\n", - safe_fname(fname)); + rprintf(FINFO, "not creating new %s \"%s\"\n", + S_ISDIR(file->mode) ? "directory" : "file", + fname); } return; } @@ -700,10 +878,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, itemize(file, ndx, statret, &st, statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL); } - if (statret != 0 && do_mkdir(fname,file->mode) != 0 && errno != EEXIST) { + if (statret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) { if (!relative_paths || errno != ENOENT || create_directory_path(fname, orig_umask) < 0 - || do_mkdir(fname, file->mode) < 0) { + || (do_mkdir(fname, file->mode) < 0 && errno != EEXIST)) { rsyserr(FERROR, errno, "recv_generator: mkdir %s failed", full_fname(fname)); @@ -711,29 +889,27 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } if (set_perms(fname, file, statret ? NULL : &st, 0) && verbose && code && f_out != -1) - rprintf(code, "%s/\n", safe_fname(fname)); + rprintf(code, "%s/\n", fname); if (delete_during && f_out != -1 && !phase && dry_run < 2 && (file->flags & FLAG_DEL_HERE)) delete_in_dir(the_file_list, fname, file); return; } - if (max_size && file->length > max_size) { - if (verbose > 1) { - rprintf(FINFO, "%s is over max-size\n", - safe_fname(fname)); - } + if (preserve_hard_links && file->link_u.links + && hard_link_check(file, ndx, fname, statret, &st, + itemizing, code, HL_CHECK_MASTER)) return; - } if (preserve_links && S_ISLNK(file->mode)) { #ifdef SUPPORT_LINKS if (safe_symlinks && unsafe_symlink(file->u.link, fname)) { if (verbose) { + if (the_file_list->count == 1) + fname = f_name(file); rprintf(FINFO, "ignoring unsafe symlink %s -> \"%s\"\n", - full_fname(fname), - safe_fname(file->u.link)); + full_fname(fname), file->u.link); } return; } @@ -754,6 +930,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } set_perms(fname, file, &st, maybe_PERMS_REPORT); + if (preserve_hard_links + && file->link_u.links) { + hard_link_cluster(file, ndx, + itemizing, + code); + } return; } } @@ -763,10 +945,22 @@ 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) { + if (try_dests_non(file, fname, ndx, itemizing, + &can_link_symlinks, + maybe_PERMS_REPORT, code) == -2) { + if (!copy_dest) + return; + itemizing = code = 0; + } } + if (preserve_hard_links && file->link_u.links + && hard_link_check(file, ndx, fname, -1, &st, + itemizing, code, HL_SKIP)) + return; if (do_symlink(file->u.link,fname) != 0) { rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed", - full_fname(fname), safe_fname(file->u.link)); + full_fname(fname), file->u.link); } else { set_perms(fname,file,NULL,0); if (itemizing) { @@ -774,33 +968,50 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, ITEM_LOCAL_CHANGE, 0, NULL); } if (code && verbose) { - rprintf(code, "%s -> %s\n", safe_fname(fname), - safe_fname(file->u.link)); + rprintf(code, "%s -> %s\n", fname, + file->u.link); } if (remove_sent_files && !dry_run) { char numbuf[4]; SIVAL(numbuf, 0, ndx); send_msg(MSG_SUCCESS, numbuf, 4); } + if (preserve_hard_links && file->link_u.links) + hard_link_cluster(file, ndx, itemizing, code); } #endif return; } if (am_root && preserve_devices && IS_DEVICE(file->mode)) { - if (statret != 0 || - st.st_mode != file->mode || - st.st_rdev != file->u.rdev) { - if (delete_item(fname, st.st_mode, DEL_TERSE) < 0) + if (statret != 0 + && (basis_dir[0] != NULL && can_link_devices)) { + if (try_dests_non(file, fname, ndx, itemizing, + &can_link_devices, + maybe_PERMS_REPORT, code) == -2) { + if (!copy_dest) + return; + itemizing = code = 0; + } + } + if (statret != 0 + || (st.st_mode & ~CHMOD_BITS) != (file->mode & ~CHMOD_BITS) + || st.st_rdev != file->u.rdev) { + if (statret == 0 + && delete_item(fname, st.st_mode, DEL_TERSE) < 0) + return; + if (preserve_hard_links && file->link_u.links + && hard_link_check(file, ndx, fname, -1, &st, + itemizing, code, HL_SKIP)) return; if (!IS_DEVICE(st.st_mode)) statret = -1; if (verbose > 2) { rprintf(FINFO,"mknod(%s,0%o,0x%x)\n", - safe_fname(fname), + fname, (int)file->mode, (int)file->u.rdev); } - if (do_mknod(fname,file->mode,file->u.rdev) != 0) { + if (do_mknod(fname,file->mode,file->u.rdev) < 0) { rsyserr(FERROR, errno, "mknod %s failed", full_fname(fname)); } else { @@ -809,38 +1020,57 @@ 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) { - rprintf(code, "%s\n", - safe_fname(fname)); + if (code && verbose) + rprintf(code, "%s\n", fname); + if (preserve_hard_links && file->link_u.links) { + hard_link_cluster(file, ndx, + itemizing, code); } } } else { if (itemizing) itemize(file, ndx, statret, &st, 0, 0, NULL); set_perms(fname, file, &st, maybe_PERMS_REPORT); + if (preserve_hard_links && file->link_u.links) + hard_link_cluster(file, ndx, itemizing, code); } return; } - if (preserve_hard_links && hard_link_check(file, ndx, HL_CHECK_MASTER)) + if (!S_ISREG(file->mode)) { + if (the_file_list->count == 1) + fname = f_name(file); + rprintf(FINFO, "skipping non-regular file \"%s\"\n", fname); return; + } - if (!S_ISREG(file->mode)) { - rprintf(FINFO, "skipping non-regular file \"%s\"\n", - safe_fname(fname)); + if (max_size && file->length > max_size) { + if (verbose > 1) { + if (the_file_list->count == 1) + fname = f_name(file); + rprintf(FINFO, "%s is over max-size\n", fname); + } + return; + } + if (min_size && file->length < min_size) { + if (verbose > 1) { + if (the_file_list->count == 1) + fname = f_name(file); + rprintf(FINFO, "%s is under min-size\n", fname); + } return; } - if (opt_ignore_existing && statret == 0) { + if (ignore_existing && statret == 0) { if (verbose > 1) - rprintf(FINFO, "%s exists\n", safe_fname(fname)); + rprintf(FINFO, "%s exists\n", fname); return; } if (update_only && statret == 0 && cmp_modtime(st.st_mtime, file->modtime) > 0) { if (verbose > 1) - rprintf(FINFO, "%s is newer\n", safe_fname(fname)); + rprintf(FINFO, "%s is newer\n", fname); return; } @@ -855,81 +1085,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } if (statret != 0 && basis_dir[0] != NULL) { - int best_match = -1; - int match_level = 0; - int i = 0; - do { - pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, - basis_dir[i], fname); - if (link_stat(fnamecmpbuf, &st, 0) < 0 - || !S_ISREG(st.st_mode)) - continue; - switch (match_level) { - case 0: - best_match = i; - match_level = 1; - /* FALL THROUGH */ - case 1: - if (!unchanged_file(fnamecmpbuf, file, &st)) - continue; - best_match = i; - match_level = 2; - if (copy_dest) - break; - /* FALL THROUGH */ - case 2: - if (!unchanged_attrs(file, &st)) - continue; - best_match = i; - match_level = 3; - break; - } - break; - } while (basis_dir[++i] != NULL); - if (match_level) { + int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &st, + itemizing, maybe_PERMS_REPORT, code); + if (j == -2) + return; + if (j != -1) { + fnamecmp = fnamecmpbuf; + fnamecmp_type = j; statret = 0; - if (i != best_match) { - i = best_match; - pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, - basis_dir[i], fname); - if (link_stat(fnamecmpbuf, &st, 0) < 0) { - match_level = 0; - statret = -1; - stat_errno = errno; - } - } -#ifdef HAVE_LINK - if (link_dest && match_level == 3) { - if (hard_link_one(file, ndx, fname, -1, &st, - fnamecmpbuf, 1, - itemizing && verbose > 1, - code) == 0) - return; - if (verbose) { - rsyserr(FINFO, errno, "link %s => %s", - full_fname(fnamecmpbuf), - safe_fname(fname)); - } - match_level = 2; - } -#endif - if (match_level == 2) { - /* Copy the file locally. */ - if (copy_file(fnamecmpbuf, fname, file->mode) < 0) { - if (verbose) { - rsyserr(FINFO, errno, - "copy_file %s => %s", - full_fname(fnamecmpbuf), - safe_fname(fname)); - } - match_level = 0; - statret = -1; - } else - set_perms(fname, file, NULL, 0); - } else if (compare_dest || match_level == 1) { - fnamecmp = fnamecmpbuf; - fnamecmp_type = i; - } } } @@ -951,7 +1114,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, f_name_to(fuzzy_file, fnamecmpbuf); if (verbose > 2) { rprintf(FINFO, "fuzzy basis selected for %s: %s\n", - safe_fname(fname), safe_fname(fnamecmpbuf)); + fname, fnamecmpbuf); } st.st_size = fuzzy_file->length; statret = 0; @@ -961,40 +1124,40 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } if (statret != 0) { - if (preserve_hard_links && hard_link_check(file, ndx, HL_SKIP)) + if (preserve_hard_links && file->link_u.links + && hard_link_check(file, ndx, fname, statret, &st, + itemizing, code, HL_SKIP)) return; if (stat_errno == ENOENT) goto notify_others; - if (verbose > 1) { - rsyserr(FERROR, stat_errno, - "recv_generator: failed to stat %s", - full_fname(fname)); - } + rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s", + full_fname(fname)); return; } - if (!compare_dest && fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH) + if (append_mode && st.st_size > file->length) + return; + + if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH) ; else if (fnamecmp_type == FNAMECMP_FUZZY) ; else if (unchanged_file(fnamecmp, file, &st)) { - if (fnamecmp_type == FNAMECMP_FNAME) { - if (itemizing) { - itemize(file, ndx, real_ret, &real_st, - 0, 0, NULL); - } - set_perms(fname, file, &st, maybe_PERMS_REPORT); - if (preserve_hard_links && file->link_u.links) - hard_link_cluster(file, ndx, itemizing, code); - return; + if (partialptr) { + do_unlink(partialptr); + handle_partial_dir(partialptr, PDIR_DELETE); } - /* Only --compare-dest gets here. */ - itemize(file, ndx, real_ret, &real_st, - ITEM_NO_DEST_AND_NO_UPDATE, 0, NULL); + if (itemizing) { + itemize(file, ndx, real_ret, &real_st, + 0, 0, NULL); + } + set_perms(fname, file, &st, maybe_PERMS_REPORT); + if (preserve_hard_links && file->link_u.links) + hard_link_cluster(file, ndx, itemizing, code); return; } -prepare_to_open: + prepare_to_open: if (partialptr) { st = partial_st; fnamecmp = partialptr; @@ -1002,7 +1165,7 @@ prepare_to_open: statret = 0; } - if (dry_run || read_batch || whole_file) + if (!do_xfers || read_batch || whole_file) goto notify_others; if (fuzzy_basis) { @@ -1017,9 +1180,11 @@ prepare_to_open: if (fd == -1) { rsyserr(FERROR, errno, "failed to open %s, continuing", full_fname(fnamecmp)); - pretend_missing: + pretend_missing: /* pretend the file didn't exist */ - if (preserve_hard_links && hard_link_check(file, ndx, HL_SKIP)) + if (preserve_hard_links && file->link_u.links + && hard_link_check(file, ndx, fname, statret, &st, + itemizing, code, HL_SKIP)) return; statret = real_ret = -1; goto notify_others; @@ -1054,13 +1219,13 @@ prepare_to_open: if (verbose > 3) { rprintf(FINFO, "gen mapped %s of size %.0f\n", - safe_fname(fnamecmp), (double)st.st_size); + fnamecmp, (double)st.st_size); } if (verbose > 2) rprintf(FINFO, "generating and sending sums for %d\n", ndx); -notify_others: + notify_others: write_int(f_out, ndx); if (itemizing) { int iflags = ITEM_TRANSFER; @@ -1074,7 +1239,7 @@ notify_others: fuzzy_file ? fuzzy_file->basename : NULL); } - if (dry_run) { + if (!do_xfers) { if (preserve_hard_links && file->link_u.links) hard_link_cluster(file, ndx, itemizing, code); return; @@ -1094,7 +1259,7 @@ notify_others: set_perms(backupptr, back_file, NULL, 0); if (verbose > 1) { rprintf(FINFO, "backed up %s to %s\n", - safe_fname(fname), safe_fname(backupptr)); + fname, backupptr); } free(back_file); } @@ -1105,26 +1270,26 @@ notify_others: void generate_files(int f_out, struct file_list *flist, char *local_name) { - int i, lull_mod; + int i; char fbuf[MAXPATHLEN]; int itemizing, maybe_PERMS_REPORT; enum logcode code; + int lull_mod = allowed_lull * 5; int need_retouch_dir_times = preserve_times && !omit_dir_times; int need_retouch_dir_perms = 0; - int save_only_existing = only_existing; - int save_opt_ignore_existing = opt_ignore_existing; - - allowed_lull = read_batch ? 0 : (io_timeout + 1) / 2; - lull_mod = allowed_lull * 5; + int save_ignore_existing = ignore_existing; + int save_ignore_non_existing = ignore_non_existing; + int save_do_progress = do_progress; + int save_make_backups = make_backups; if (protocol_version >= 29) { itemizing = 1; maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT; code = daemon_log_format_has_i ? 0 : FLOG; } else if (am_daemon) { - itemizing = daemon_log_format_has_i && !dry_run; + itemizing = daemon_log_format_has_i && do_xfers; maybe_PERMS_REPORT = PERMS_REPORT; - code = itemizing || dry_run ? FCLIENT : FINFO; + code = itemizing || !do_xfers ? FCLIENT : FINFO; } else if (!am_server) { itemizing = log_format_has_i; maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT; @@ -1142,8 +1307,9 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) if (delete_before && !local_name && flist->count > 0) do_delete_pass(flist); + do_progress = 0; - if (whole_file < 0) + if (append_mode || whole_file < 0) whole_file = 0; if (verbose >= 2) { rprintf(FINFO, "delta-transmission %s\n", @@ -1152,8 +1318,11 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) : "enabled"); } - if (protocol_version < 29) - ignore_timeout = 1; + /* Since we often fill up the outgoing socket and then just sit around + * waiting for the other 2 processes to do their thing, we don't want + * to exit on a timeout. If the data stops flowing, the receiver will + * notice that and let us know via the redo pipe (or its closing). */ + ignore_timeout = 1; for (i = 0; i < flist->count; i++) { struct file_struct *file = flist->files[i]; @@ -1161,29 +1330,37 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) if (!file->basename) continue; - recv_generator(local_name ? local_name : f_name_to(file, fbuf), - file, i, itemizing, maybe_PERMS_REPORT, code, - f_out); + if (local_name) + strlcpy(fbuf, local_name, sizeof fbuf); + else + f_name_to(file, fbuf); + recv_generator(fbuf, file, i, itemizing, maybe_PERMS_REPORT, + code, f_out); /* We need to ensure that any dirs we create have writeable * permissions during the time we are putting files within * them. This is then fixed after the transfer is done. */ - if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR)) { +#ifdef HAVE_CHMOD + if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR) + && !list_only) { int mode = file->mode | S_IWUSR; /* user write */ char *fname = local_name ? local_name : fbuf; - if (do_chmod(fname, mode & CHMOD_BITS) < 0) { + if (do_chmod(fname, mode) < 0) { rsyserr(FERROR, errno, "failed to modify permissions on %s", full_fname(fname)); } need_retouch_dir_perms = 1; } +#endif if (preserve_hard_links) check_for_finished_hlinks(itemizing, code); if (allowed_lull && !(i % lull_mod)) maybe_send_keepalive(); + else if (!(i % 200)) + maybe_flush_socket(); } recv_generator(NULL, NULL, 0, 0, 0, code, -1); if (delete_during) @@ -1191,15 +1368,13 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) phase++; csum_length = SUM_LENGTH; - only_existing = max_size = opt_ignore_existing = 0; + max_size = min_size = ignore_existing = ignore_non_existing = 0; update_only = always_checksum = size_only = 0; ignore_times = 1; + if (append_mode) /* resend w/o append mode */ + append_mode = -1; /* ... but only longer files */ make_backups = 0; /* avoid a duplicate backup for inplace processing */ - /* We expect to just sit around now, so don't exit on a timeout. - * If we really get a timeout then the other process should exit. */ - ignore_timeout = 1; - if (verbose > 2) rprintf(FINFO,"generate_files phase=%d\n",phase); @@ -1209,23 +1384,41 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) * to catch initial checksum errors */ while ((i = get_redo_num(itemizing, code)) != -1) { struct file_struct *file = flist->files[i]; - recv_generator(local_name ? local_name : f_name_to(file, fbuf), - file, i, itemizing, maybe_PERMS_REPORT, code, - f_out); + if (local_name) + strlcpy(fbuf, local_name, sizeof fbuf); + else + f_name_to(file, fbuf); + recv_generator(fbuf, file, i, itemizing, maybe_PERMS_REPORT, + code, f_out); } phase++; - only_existing = save_only_existing; - opt_ignore_existing = save_opt_ignore_existing; + ignore_non_existing = save_ignore_non_existing; + ignore_existing = save_ignore_existing; + make_backups = save_make_backups; if (verbose > 2) rprintf(FINFO,"generate_files phase=%d\n",phase); write_int(f_out, -1); + /* Reduce round-trip lag-time for a useless delay-updates phase. */ + if (protocol_version >= 29 && !delay_updates) + write_int(f_out, -1); - /* Read post-redo-phase MSG_DONE and any prior messages. */ + /* Read MSG_DONE for the redo phase (and any prior messages). */ get_redo_num(itemizing, code); + if (protocol_version >= 29) { + phase++; + if (verbose > 2) + rprintf(FINFO, "generate_files phase=%d\n", phase); + if (delay_updates) + write_int(f_out, -1); + /* Read MSG_DONE for delay-updates phase & prior messages. */ + get_redo_num(itemizing, code); + } + + do_progress = save_do_progress; if (delete_after && !local_name && flist->count > 0) do_delete_pass(flist); @@ -1241,11 +1434,12 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) continue; if (!need_retouch_dir_times && file->mode & S_IWUSR) continue; - recv_generator(local_name ? local_name : f_name(file), - file, i, itemizing, maybe_PERMS_REPORT, - code, -1); - if (allowed_lull && !(j++ % lull_mod)) + recv_generator(f_name(file), file, i, itemizing, + maybe_PERMS_REPORT, code, -1); + if (allowed_lull && !(++j % lull_mod)) maybe_send_keepalive(); + else if (!(j % 200)) + maybe_flush_socket(); } } recv_generator(NULL, NULL, 0, 0, 0, code, -1);