X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/00b9618460c40131a8925047853f73ccbe9fc20b..6d4ecad122887af92dc1363c9e0d4cca542bf2f5:/generator.c diff --git a/generator.c b/generator.c index 56065557..88abe9c9 100644 --- a/generator.c +++ b/generator.c @@ -52,13 +52,16 @@ 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 OFF_T min_size; extern int io_error; extern int allowed_lull; extern int sock_f_out; @@ -66,6 +69,7 @@ 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; @@ -74,7 +78,6 @@ extern int link_dest; extern int whole_file; 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. */ @@ -91,6 +94,10 @@ extern struct filter_list_struct server_filter_list; static int deletion_count = 0; /* used to implement --max-delete */ +/* 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 +107,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 +141,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; @@ -158,21 +168,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); - delete_item(buf, fp->mode, flags & ~DEL_TERSE); + 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) @@ -292,6 +310,8 @@ static void do_delete_pass(struct file_list *flist) delete_in_dir(flist, fbuf, file); } + delete_in_dir(NULL, NULL, NULL); + if (do_progress && !am_server) rprintf(FINFO, " \r"); } @@ -367,8 +387,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) @@ -445,8 +464,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, @@ -470,35 +489,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) @@ -584,6 +610,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, @@ -633,7 +661,7 @@ 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", @@ -667,8 +695,7 @@ 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 %s \"%s\"\n", S_ISDIR(file->mode) ? "directory" : "file", @@ -723,6 +750,11 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, return; } + 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)) { @@ -753,6 +785,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,6 +801,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (!S_ISLNK(st.st_mode)) statret = -1; } + 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)); @@ -781,16 +823,23 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, 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 + || (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; @@ -812,20 +861,21 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, rprintf(code, "%s\n", safe_fname(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, fname, statret, &st, - itemizing, code, HL_CHECK_MASTER)) - return; - if (!S_ISREG(file->mode)) { if (the_file_list->count == 1) fname = f_name(file); @@ -843,8 +893,17 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } 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", + safe_fname(fname)); + } + return; + } - if (opt_ignore_existing && statret == 0) { + if (ignore_existing && statret == 0) { if (verbose > 1) rprintf(FINFO, "%s exists\n", safe_fname(fname)); return; @@ -993,25 +1052,29 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } if (statret != 0) { - if (preserve_hard_links + 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 (append_mode && st.st_size > file->length) + return; + if (!compare_dest && fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH) ; else if (fnamecmp_type == FNAMECMP_FUZZY) ; else if (unchanged_file(fnamecmp, file, &st)) { + if (partialptr) { + do_unlink(partialptr); + handle_partial_dir(partialptr, PDIR_DELETE); + } if (fnamecmp_type == FNAMECMP_FNAME) { if (itemizing) { itemize(file, ndx, real_ret, &real_st, @@ -1028,7 +1091,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, return; } -prepare_to_open: + prepare_to_open: if (partialptr) { st = partial_st; fnamecmp = partialptr; @@ -1051,9 +1114,9 @@ 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 + if (preserve_hard_links && file->link_u.links && hard_link_check(file, ndx, fname, statret, &st, itemizing, code, HL_SKIP)) return; @@ -1096,7 +1159,7 @@ prepare_to_open: 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; @@ -1148,8 +1211,8 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) 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; + 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; @@ -1180,7 +1243,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) 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", @@ -1201,9 +1264,12 @@ 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 @@ -1236,9 +1302,11 @@ 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 */ if (verbose > 2) @@ -1250,14 +1318,17 @@ 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)