X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e6bc6f42325e2127c7289cb28833e091c783d8ca..e957626347a9184a1d4795a4b0a99e77089c9090:/generator.c diff --git a/generator.c b/generator.c index ac68c576..f645bf75 100644 --- a/generator.c +++ b/generator.c @@ -58,6 +58,7 @@ extern int size_only; extern OFF_T max_size; extern int io_timeout; extern int io_error; +extern int sock_f_out; extern int ignore_timeout; extern int protocol_version; extern int fuzzy_basis; @@ -82,9 +83,11 @@ extern dev_t filesystem_dev; extern char *backup_dir; extern char *backup_suffix; 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 */ @@ -149,7 +152,7 @@ static int delete_item(char *fname, int mode, int flags) full_fname(fname)); return -1; } - flags |= DEL_FORCE_RECURSE; + flags |= DEL_FORCE_RECURSE; /* mark subdir dels as not "in the way" */ dlen = strlcpy(buf, fname, MAXPATHLEN); save_filters = push_local_filters(buf, dlen); @@ -194,7 +197,7 @@ static int delete_item(char *fname, int mode, int flags) * call will append names onto the end, but the old dir value will be restored * on exit). */ static void delete_in_dir(struct file_list *flist, char *fbuf, - struct file_struct *file, int allowed_lull) + struct file_struct *file) { static int min_depth = MAXPATHLEN, cur_depth = -1; static void *filt_array[MAXPATHLEN/2+1]; @@ -215,7 +218,7 @@ static void delete_in_dir(struct file_list *flist, char *fbuf, rprintf(FINFO, "delete_in_dir(%s)\n", safe_fname(fbuf)); if (allowed_lull) - maybe_send_keepalive(allowed_lull, flist->count); + maybe_send_keepalive(); if (file->dir.depth >= MAXPATHLEN/2+1) return; /* Impossible... */ @@ -264,7 +267,7 @@ static void delete_in_dir(struct file_list *flist, char *fbuf, /* This deletes any files on the receiving side that are not present on the * sending side. This is used by --delete-before and --delete-after. */ -static void do_delete_pass(struct file_list *flist, int allowed_lull) +static void do_delete_pass(struct file_list *flist) { char fbuf[MAXPATHLEN]; int j; @@ -279,7 +282,7 @@ static void do_delete_pass(struct file_list *flist, int allowed_lull) if (verbose > 1 && file->flags & FLAG_TOP_DIR) rprintf(FINFO, "deleting in %s\n", safe_fname(fbuf)); - delete_in_dir(flist, fbuf, file, allowed_lull); + delete_in_dir(flist, fbuf, file); } } @@ -299,26 +302,18 @@ static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st) } -#define SID_UPDATING ITEM_UPDATING -#define SID_REPORT_CHECKSUM ITEM_REPORT_CHECKSUM -#define SID_USING_ALT_BASIS ITEM_USING_ALT_BASIS -/* This flag doesn't get sent, so it must be outside 0xffff. */ -#define SID_NO_DEST_AND_NO_UPDATE (1<<16) - -static void itemize(struct file_struct *file, int statret, STRUCT_STAT *st, - int32 sflags, int f_out, int ndx) +void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st, + int32 iflags, char *hlink) { - int iflags = sflags & 0xffff; - - if (statret >= 0) { + if (statret == 0) { if (S_ISREG(file->mode) && file->length != st->st_size) iflags |= ITEM_REPORT_SIZE; - if (!(sflags & SID_NO_DEST_AND_NO_UPDATE)) { + 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_UPDATING && !keep_time) + 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) @@ -329,16 +324,23 @@ static void itemize(struct file_struct *file, int statret, STRUCT_STAT *st, && st->st_gid != file->gid) iflags |= ITEM_REPORT_GROUP; } - } else - iflags |= ITEM_IS_NEW | ITEM_UPDATING; + } else { + iflags |= ITEM_IS_NEW; + if (!(iflags & (ITEM_HARD_LINKED|ITEM_LOCAL_CHANGE))) + iflags |= ITEM_TRANSFER; + } - if ((iflags || verbose > 1) && !read_batch) { + iflags &= 0xffff; + if ((iflags & SIGNIFICANT_ITEM_FLAGS || verbose > 1 + || (hlink && *hlink)) && !read_batch) { if (protocol_version >= 29) { if (ndx >= 0) - write_int(f_out, ndx); - write_shortint(f_out, iflags); + write_int(sock_f_out, ndx); + write_shortint(sock_f_out, iflags); + if (hlink) + write_vstring(sock_f_out, hlink, strlen(hlink)); } else if (ndx >= 0) - log_recv(file, &stats, iflags); + log_item(file, &stats, iflags, hlink); } } @@ -546,8 +548,24 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist) return lowest_j; } +void check_for_finished_hlinks(int itemizing, enum logcode code) +{ + struct file_struct *file; + int ndx; -/* Acts on flist->file's ndx'th item, whose name is fname. If a directory, + while ((ndx = get_hlink_num()) != -1) { + if (ndx < 0 || ndx >= the_file_list->count) + continue; + + file = the_file_list->files[ndx]; + if (!file->link_u.links) + continue; + + hard_link_cluster(file, ndx, itemizing, code); + } +} + +/* Acts on the_file_list->file's ndx'th item, whose name is fname. If a dir, * make sure it exists, and has the right permissions/timestamp info. For * all other non-regular files (symlinks, etc.) we create them here. For * regular files that have changed, we try to find a basis file and then @@ -555,11 +573,9 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist) * * 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_list *flist, - struct file_struct *file, int ndx, +static void recv_generator(char *fname, struct file_struct *file, int ndx, int itemizing, int maybe_PERMS_REPORT, - enum logcode code, int allowed_lull, - int f_out, int f_out_name) + enum logcode code, int f_out, int f_out_name) { static int missing_below = -1, excluded_below = -1; static char *fuzzy_dirname = NULL; @@ -672,8 +688,10 @@ static void recv_generator(char *fname, struct file_list *flist, missing_below = file->dir.depth; dry_run++; } - if (itemizing && f_out != -1) - itemize(file, statret, &st, 0, f_out, ndx); + if (itemizing && f_out != -1) { + itemize(file, ndx, statret, &st, + statret ? ITEM_LOCAL_CHANGE : 0, NULL); + } if (statret != 0 && do_mkdir(fname,file->mode) != 0 && errno != EEXIST) { if (!relative_paths || errno != ENOENT || create_directory_path(fname, orig_umask) < 0 @@ -688,7 +706,7 @@ static void recv_generator(char *fname, struct file_list *flist, rprintf(code, "%s/\n", safe_fname(fname)); if (delete_during && f_out != -1 && csum_length != SUM_LENGTH && (file->flags & FLAG_DEL_HERE)) - delete_in_dir(flist, fname, file, allowed_lull); + delete_in_dir(the_file_list, fname, file); return; } @@ -723,8 +741,8 @@ static void recv_generator(char *fname, struct file_list *flist, * required. */ if (strcmp(lnk, file->u.link) == 0) { if (itemizing) { - itemize(file, 0, &st, 0, - f_out, ndx); + itemize(file, ndx, 0, &st, 0, + NULL); } set_perms(fname, file, &st, maybe_PERMS_REPORT); @@ -746,8 +764,8 @@ static void recv_generator(char *fname, struct file_list *flist, } else { set_perms(fname,file,NULL,0); if (itemizing) { - itemize(file, statret, &st, SID_UPDATING, - f_out, ndx); + itemize(file, ndx, statret, &st, + ITEM_LOCAL_CHANGE, NULL); } if (code && verbose) { rprintf(code, "%s -> %s\n", safe_fname(fname), @@ -781,8 +799,8 @@ static void recv_generator(char *fname, struct file_list *flist, } else { set_perms(fname,file,NULL,0); if (itemizing) { - itemize(file, statret, &st, SID_UPDATING, - f_out, ndx); + itemize(file, ndx, statret, &st, + ITEM_LOCAL_CHANGE, NULL); } if (code && verbose) { rprintf(code, "%s\n", @@ -790,16 +808,14 @@ static void recv_generator(char *fname, struct file_list *flist, } } } else { - if (itemizing) { - itemize(file, statret, &st, 0, - f_out, ndx); - } + if (itemizing) + itemize(file, ndx, statret, &st, 0, NULL); set_perms(fname, file, &st, maybe_PERMS_REPORT); } return; } - if (preserve_hard_links && hard_link_check(file, HL_CHECK_MASTER)) + if (preserve_hard_links && hard_link_check(file, ndx, HL_CHECK_MASTER)) return; if (!S_ISREG(file->mode)) { @@ -808,58 +824,80 @@ static void recv_generator(char *fname, struct file_list *flist, return; } + if (opt_ignore_existing && statret == 0) { + if (verbose > 1) + rprintf(FINFO, "%s exists\n", safe_fname(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)); + return; + } + fnamecmp = fname; fnamecmp_type = FNAMECMP_FNAME; if (statret != 0 && basis_dir[0] != NULL) { - int fallback_match = -1; + 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)) { - statret = 0; - if (link_dest) { - if (!match_level) { - fallback_match = i; - match_level = 1; - } else if (match_level == 2 - && !unchanged_attrs(file, &st)) - continue; - if (!unchanged_file(fnamecmpbuf, file, &st)) - continue; - fallback_match = i; - match_level = 2; - if (!unchanged_attrs(file, &st)) - continue; - } + 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; + /* FALL THROUGH */ + case 2: + if (!unchanged_attrs(file, &st)) + continue; + best_match = i; match_level = 3; break; } + break; } while (basis_dir[++i] != NULL); - if (statret == 0) { - if (match_level < 3) { - i = fallback_match; + if (match_level) { + 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 && !dry_run) { - if (do_link(fnamecmpbuf, fname) < 0) { - if (verbose) { - rsyserr(FINFO, errno, - "link %s => %s", - full_fname(fnamecmpbuf), - safe_fname(fname)); - } - fnamecmp = fnamecmpbuf; - fnamecmp_type = i; + 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)); } - } else + match_level = 2; + } #endif - { + if (compare_dest || (match_level && match_level < 3)) { fnamecmp = fnamecmpbuf; fnamecmp_type = i; } @@ -900,7 +938,7 @@ static void recv_generator(char *fname, struct file_list *flist, } if (statret != 0) { - if (preserve_hard_links && hard_link_check(file, HL_SKIP)) + if (preserve_hard_links && hard_link_check(file, ndx, HL_SKIP)) return; if (stat_errno == ENOENT) goto notify_others; @@ -912,33 +950,25 @@ static void recv_generator(char *fname, struct file_list *flist, return; } - if (opt_ignore_existing && fnamecmp_type == FNAMECMP_FNAME) { - if (verbose > 1) - rprintf(FINFO, "%s exists\n", safe_fname(fname)); - return; - } - - if (update_only && fnamecmp_type == FNAMECMP_FNAME - && cmp_modtime(st.st_mtime, file->modtime) > 0) { - if (verbose > 1) - rprintf(FINFO, "%s is newer\n", safe_fname(fname)); - return; - } - if (!compare_dest && fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH) ; else if (fnamecmp_type == FNAMECMP_FUZZY) ; else if (unchanged_file(fnamecmp, file, &st)) { - if (itemizing) { - itemize(file, statret, &st, - fnamecmp_type == FNAMECMP_FNAME - ? 0 : SID_NO_DEST_AND_NO_UPDATE, - f_out, ndx); - } - if (fnamecmp_type == FNAMECMP_FNAME) + if (fnamecmp_type == FNAMECMP_FNAME) { + if (itemizing) + itemize(file, ndx, statret, &st, 0, NULL); set_perms(fname, file, &st, maybe_PERMS_REPORT); - return; + if (preserve_hard_links && file->link_u.links) + hard_link_cluster(file, ndx, itemizing, code); + return; + } + /* Only --compare-dest gets here. */ + if (unchanged_attrs(file, &st)) { + itemize(file, ndx, statret, &st, + ITEM_NO_DEST_AND_NO_UPDATE, NULL); + return; + } } prepare_to_open: @@ -949,13 +979,8 @@ prepare_to_open: statret = 0; } - if (dry_run || read_batch) - goto notify_others; - if (whole_file > 0) { - if (statret == 0) - statret = 1; + if (dry_run || read_batch || whole_file) goto notify_others; - } if (fuzzy_basis) { int j = flist_find(fuzzy_dirlist, file); @@ -971,7 +996,7 @@ prepare_to_open: full_fname(fnamecmp)); pretend_missing: /* pretend the file didn't exist */ - if (preserve_hard_links && hard_link_check(file, HL_SKIP)) + if (preserve_hard_links && hard_link_check(file, ndx, HL_SKIP)) return; statret = -1; goto notify_others; @@ -1015,58 +1040,54 @@ prepare_to_open: notify_others: write_int(f_out, ndx); if (itemizing) { - int iflags = SID_UPDATING; + int iflags = ITEM_TRANSFER; if (always_checksum) - iflags |= SID_REPORT_CHECKSUM; + iflags |= ITEM_REPORT_CHECKSUM; if (fnamecmp_type != FNAMECMP_FNAME) - iflags |= SID_USING_ALT_BASIS; - itemize(file, statret, &st, iflags, f_out, -1); + iflags |= ITEM_USING_ALT_BASIS; + itemize(file, -1, statret, &st, iflags, NULL); } if (f_out_name >= 0) { write_byte(f_out_name, fnamecmp_type); if (fnamecmp_type == FNAMECMP_FUZZY) { - uchar lenbuf[3], *lb = lenbuf; - int len = strlen(fuzzy_file->basename); - if (len > 0x7F) { -#if MAXPATHLEN > 0x7FFF - *lb++ = len / 0x10000 + 0x80; - *lb++ = len / 0x100; -#else - *lb++ = len / 0x100 + 0x80; -#endif - } - *lb = len; - write_buf(f_out_name, (char*)lenbuf, lb - lenbuf + 1); - write_buf(f_out_name, fuzzy_file->basename, len); + write_vstring(f_out_name, fuzzy_file->basename, + strlen(fuzzy_file->basename)); } } - if (dry_run || read_batch) + if (dry_run) { + if (preserve_hard_links && file->link_u.links) + hard_link_cluster(file, ndx, itemizing, code); + return; + } + if (read_batch) return; - if (statret == 0) { - generate_and_send_sums(fd, st.st_size, f_out, f_copy); - - if (f_copy >= 0) { - close(f_copy); - set_perms(backupptr, back_file, NULL, 0); - if (verbose > 1) { - rprintf(FINFO, "backed up %s to %s\n", - safe_fname(fname), safe_fname(backupptr)); - } - free(back_file); + if (statret != 0 || whole_file) { + write_sum_head(f_out, NULL); + return; + } + + generate_and_send_sums(fd, st.st_size, f_out, f_copy); + + if (f_copy >= 0) { + close(f_copy); + set_perms(backupptr, back_file, NULL, 0); + if (verbose > 1) { + rprintf(FINFO, "backed up %s to %s\n", + safe_fname(fname), safe_fname(backupptr)); } + free(back_file); + } - close(fd); - } else - write_sum_head(f_out, NULL); + close(fd); } void generate_files(int f_out, struct file_list *flist, char *local_name, int f_out_name) { - int i; + int i, lull_mod; int phase = 0; char fbuf[MAXPATHLEN]; int itemizing, maybe_PERMS_REPORT; @@ -1075,7 +1096,9 @@ void generate_files(int f_out, struct file_list *flist, char *local_name, int need_retouch_dir_perms = 0; int save_only_existing = only_existing; int save_opt_ignore_existing = opt_ignore_existing; - int allowed_lull = read_batch ? 0 : io_timeout / 2; + + allowed_lull = read_batch ? 0 : (io_timeout + 1) / 2; + lull_mod = allowed_lull * 5; if (protocol_version >= 29) { itemizing = 1; @@ -1101,11 +1124,13 @@ 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, allowed_lull); + do_delete_pass(flist); + if (whole_file < 0) + whole_file = 0; if (verbose >= 2) { rprintf(FINFO, "delta-transmission %s\n", - whole_file > 0 + whole_file ? "disabled for local transfer or --whole-file" : "enabled"); } @@ -1131,15 +1156,17 @@ void generate_files(int f_out, struct file_list *flist, char *local_name, } recv_generator(local_name ? local_name : f_name_to(file, fbuf), - flist, file, i, itemizing, maybe_PERMS_REPORT, - code, allowed_lull, f_out, f_out_name); + file, i, itemizing, maybe_PERMS_REPORT, code, + f_out, f_out_name); + if (preserve_hard_links) + check_for_finished_hlinks(itemizing, code); - if (allowed_lull && !(i % 100)) - maybe_send_keepalive(allowed_lull, flist->count); + if (allowed_lull && !(i % lull_mod)) + maybe_send_keepalive(); } - recv_generator(NULL, NULL, NULL, 0, 0, 0, code, 0, -1, -1); + recv_generator(NULL, NULL, 0, 0, 0, code, -1, -1); if (delete_during) - delete_in_dir(NULL, NULL, NULL, 0); + delete_in_dir(NULL, NULL, NULL); phase++; csum_length = SUM_LENGTH; @@ -1159,13 +1186,11 @@ void generate_files(int f_out, struct file_list *flist, char *local_name, /* files can cycle through the system more than once * to catch initial checksum errors */ - while ((i = get_redo_num()) != -1) { + 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), - flist, file, i, itemizing, maybe_PERMS_REPORT, - code, allowed_lull, f_out, f_out_name); - if (allowed_lull) - maybe_send_keepalive(allowed_lull, flist->count); + file, i, itemizing, maybe_PERMS_REPORT, code, + f_out, f_out_name); } phase++; @@ -1178,16 +1203,14 @@ void generate_files(int f_out, struct file_list *flist, char *local_name, write_int(f_out, -1); /* Read post-redo-phase MSG_DONE and any prior messages. */ - get_redo_num(); - - if (preserve_hard_links) - do_hard_links(); + get_redo_num(itemizing, code); if (delete_after && !local_name && flist->count > 0) - do_delete_pass(flist, allowed_lull); + do_delete_pass(flist); if ((need_retouch_dir_perms || need_retouch_dir_times) && !list_only && !local_name && !dry_run) { + int j = 0; /* Now we need to fix any directory permissions that were * modified during the transfer and/or re-set any tweaked * modified-time values. */ @@ -1198,14 +1221,13 @@ void generate_files(int f_out, struct file_list *flist, char *local_name, if (!need_retouch_dir_times && file->mode & S_IWUSR) continue; recv_generator(local_name ? local_name : f_name(file), - flist, file, i, itemizing, - maybe_PERMS_REPORT, code, allowed_lull, - -1, -1); - if (allowed_lull && !(i % 500)) - maybe_send_keepalive(allowed_lull, flist->count); + file, i, itemizing, maybe_PERMS_REPORT, + code, -1, -1); + if (allowed_lull && !(j++ % lull_mod)) + maybe_send_keepalive(); } } - recv_generator(NULL, NULL, NULL, 0, 0, 0, code, 0, -1, -1); + recv_generator(NULL, NULL, 0, 0, 0, code, -1, -1); if (verbose > 2) rprintf(FINFO,"generate_files finished\n");