X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/2be2fb3ed37af204267e90be65e60250991cb6e1..8982a89b24be0a0b43c85ec64d89b70c941a050c:/generator.c diff --git a/generator.c b/generator.c index 2ffd03f5..e58f7b00 100644 --- a/generator.c +++ b/generator.c @@ -34,6 +34,9 @@ extern int preserve_hard_links; extern int preserve_perms; extern int preserve_uid; extern int preserve_gid; +extern int preserve_times; +extern int omit_dir_times; +extern int delete_during; extern int update_only; extern int opt_ignore_existing; extern int inplace; @@ -58,7 +61,7 @@ extern int orig_umask; extern int safe_symlinks; extern long block_size; /* "long" because popt can't set an int32. */ -extern struct exclude_list_struct server_exclude_list; +extern struct filter_list_struct server_filter_list; static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st) { @@ -100,23 +103,6 @@ static int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st) } -/* - * NULL sum_struct means we have no checksums - */ -void write_sum_head(int f, struct sum_struct *sum) -{ - static struct sum_struct null_sum; - - if (sum == NULL) - sum = &null_sum; - - write_int(f, sum->count); - write_int(f, sum->blength); - if (protocol_version >= 27) - write_int(f, sum->s2length); - write_int(f, sum->remainder); -} - /* * set (initialize) the size entries in the per-file sum_struct * calculating dynamic block and checksum sizes. @@ -134,7 +120,7 @@ void write_sum_head(int f, struct sum_struct *sum) * * This might be made one of several selectable heuristics. */ -static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len) +static void sum_sizes_sqroot(struct sum_struct *sum, int64 len) { int32 blength; int s2length; @@ -145,18 +131,21 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len) blength = BLOCK_SIZE; else { int32 c; - uint64 l; - for (c = 1, l = len; l >>= 2; c <<= 1) { - assert(c > 0); + int64 l; + int cnt; + for (c = 1, l = len, cnt = 0; l >>= 2; c <<= 1, cnt++) {} + if (cnt >= 31 || c >= MAX_BLOCK_SIZE) + blength = MAX_BLOCK_SIZE; + else { + blength = 0; + do { + blength |= c; + if (len < (int64)blength * blength) + blength &= ~c; + c >>= 1; + } while (c >= 8); /* round to multiple of 8 */ + blength = MAX(blength, BLOCK_SIZE); } - blength = 0; - do { - blength |= c; - if (len < (uint64)blength * blength) - blength &= ~c; - c >>= 1; - } while (c >= 8); /* round to multiple of 8 */ - blength = MAX(blength, BLOCK_SIZE); } if (protocol_version < 27) { @@ -165,7 +154,7 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len) s2length = SUM_LENGTH; } else { int32 c; - uint64 l; + int64 l; int b = BLOCKSUM_BIAS; for (l = len; l >>= 1; b += 2) {} for (c = blength; c >>= 1 && b; b--) {} @@ -239,16 +228,16 @@ static void generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy) } - -/* - * Acts on file number @p i from @p flist, whose name is @p fname. +/* Acts on flist->file's ndx'th item, whose name is fname. If a directory, + * 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 + * start sending checksums. * - * First fixes up permissions, then generates checksums for the file. - * - * @note This comment was added later by mbp who was trying to work it - * out. It might be wrong. - */ -static void recv_generator(char *fname, struct file_struct *file, int i, + * 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, int f_out, int f_out_name) { int fd = -1, f_copy = -1; @@ -263,11 +252,11 @@ static void recv_generator(char *fname, struct file_struct *file, int i, return; if (verbose > 2) - rprintf(FINFO, "recv_generator(%s,%d)\n", safe_fname(fname), i); + rprintf(FINFO, "recv_generator(%s,%d)\n", safe_fname(fname), ndx); - if (server_exclude_list.head - && check_exclude(&server_exclude_list, fname, - S_ISDIR(file->mode)) < 0) { + if (server_filter_list.head + && check_filter(&server_filter_list, fname, + S_ISDIR(file->mode)) < 0) { if (verbose) { rprintf(FINFO, "skipping server-excluded file \"%s\"\n", safe_fname(fname)); @@ -307,33 +296,28 @@ static void recv_generator(char *fname, struct file_struct *file, int i, * to prepare appropriately. If there is already a * file of that name and it is *not* a directory, then * we need to delete it. If it doesn't exist, then - * recursively create it. */ - - if (dry_run) - return; /* TODO: causes inaccuracies -- fix */ + * (perhaps recursively) create it. */ if (statret == 0 && !S_ISDIR(st.st_mode)) { - if (robust_unlink(fname) != 0) { - rsyserr(FERROR, errno, - "recv_generator: unlink %s to make room for directory", - full_fname(fname)); - return; - } + delete_file(fname, DEL_TERSE); statret = -1; } 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)) { + if (!relative_paths || errno != ENOENT + || create_directory_path(fname, orig_umask) < 0 + || do_mkdir(fname, file->mode) < 0) { rsyserr(FERROR, errno, "recv_generator: mkdir %s failed", full_fname(fname)); } } - /* f_out is set to -1 when doing final directory-permission - * and modification-time repair. */ if (set_perms(fname, file, statret ? NULL : &st, 0) && verbose && f_out != -1) rprintf(FINFO, "%s/\n", safe_fname(fname)); + if (delete_during && f_out != -1 && csum_length != SUM_LENGTH + && (file->flags & FLAG_DEL_START)) { + delete_in_dir(flist, fname, strlen(fname), + file->dir.depth); + } return; } else if (max_size && file->length > max_size) { if (verbose > 1) @@ -343,9 +327,6 @@ static void recv_generator(char *fname, struct file_struct *file, int i, if (preserve_links && S_ISLNK(file->mode)) { #if SUPPORT_LINKS - char lnk[MAXPATHLEN]; - int l; - if (safe_symlinks && unsafe_symlink(file->u.link, fname)) { if (verbose) { rprintf(FINFO, "ignoring unsafe symlink %s -> \"%s\"\n", @@ -354,22 +335,25 @@ static void recv_generator(char *fname, struct file_struct *file, int i, return; } if (statret == 0) { - l = readlink(fname,lnk,MAXPATHLEN-1); - if (l > 0) { - lnk[l] = 0; + int dflag = S_ISDIR(st.st_mode) ? DEL_DIR : 0; + char lnk[MAXPATHLEN]; + int len; + + if (!dflag + && (len = readlink(fname, lnk, MAXPATHLEN-1)) > 0) { + lnk[len] = 0; /* A link already pointing to the * right place -- no further action * required. */ - if (strcmp(lnk,file->u.link) == 0) { + if (strcmp(lnk, file->u.link) == 0) { set_perms(fname, file, &st, PERMS_REPORT); return; } } - /* Not a symlink, so delete whatever's - * already there and put a new symlink - * in place. */ - delete_file(fname); + /* Not the right symlink (or not a symlink), so + * delete it. */ + delete_file(fname, dflag | DEL_TERSE); } if (do_symlink(file->u.link,fname) != 0) { rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed", @@ -389,7 +373,8 @@ static void recv_generator(char *fname, struct file_struct *file, int i, if (statret != 0 || st.st_mode != file->mode || st.st_rdev != file->u.rdev) { - delete_file(fname); + int dflag = S_ISDIR(st.st_mode) ? DEL_DIR : 0; + delete_file(fname, dflag | DEL_TERSE); if (verbose > 2) { rprintf(FINFO,"mknod(%s,0%o,0x%x)\n", safe_fname(fname), @@ -479,7 +464,8 @@ static void recv_generator(char *fname, struct file_struct *file, int i, } if (statret == 0 && !S_ISREG(st.st_mode)) { - if (delete_file(fname) != 0) + int dflag = S_ISDIR(st.st_mode) ? DEL_DIR : 0; + if (delete_file(fname, dflag | DEL_TERSE) != 0) return; statret = -1; stat_errno = ENOENT; @@ -561,7 +547,7 @@ prepare_to_open: close(fd); return; } - if (!(back_file = make_file(fname, NULL, NO_EXCLUDES))) { + if (!(back_file = make_file(fname, NULL, NO_FILTERS))) { close(fd); goto pretend_missing; } @@ -589,10 +575,12 @@ prepare_to_open: } if (verbose > 2) - rprintf(FINFO, "generating and sending sums for %d\n", i); + rprintf(FINFO, "generating and sending sums for %d\n", ndx); notify_others: - write_int(f_out, i); + write_int(f_out, ndx); + if (protocol_version >= 29 && inplace && !read_batch) + write_byte(f_out, fnamecmp_type); if (f_out_name >= 0) write_byte(f_out_name, fnamecmp_type); @@ -624,6 +612,10 @@ void generate_files(int f_out, struct file_list *flist, char *local_name, int i; int phase = 0; char fbuf[MAXPATHLEN]; + 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; if (verbose > 2) { rprintf(FINFO, "generator starting pid=%ld count=%d\n", @@ -637,9 +629,8 @@ void generate_files(int f_out, struct file_list *flist, char *local_name, : "delta transmission enabled\n"); } - /* 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 */ + /* 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. */ io_timeout = 0; for (i = 0; i < flist->count; i++) { @@ -648,23 +639,27 @@ void generate_files(int f_out, struct file_list *flist, char *local_name, if (!file->basename) continue; - /* we need to ensure that any directories we create have writeable - permissions initially so that we can create the files within - them. This is then fixed after the files are transferred */ + + /* 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)) { copy = *file; - /* XXX: Could this be causing a problem on SCO? Perhaps their - * handling of permissions is strange? */ copy.mode |= S_IWUSR; /* user write */ file = © + need_retouch_dir_perms = 1; } recv_generator(local_name ? local_name : f_name_to(file, fbuf), - file, i, f_out, f_out_name); + flist, file, i, f_out, f_out_name); } + if (delete_during) + delete_in_dir(NULL, NULL, 0, 0); phase++; csum_length = SUM_LENGTH; + only_existing = max_size = opt_ignore_existing = 0; + update_only = always_checksum = size_only = 0; ignore_times = 1; if (verbose > 2) @@ -677,10 +672,13 @@ void generate_files(int f_out, struct file_list *flist, char *local_name, while ((i = get_redo_num()) != -1) { struct file_struct *file = flist->files[i]; recv_generator(local_name ? local_name : f_name_to(file, fbuf), - file, i, f_out, f_out_name); + flist, file, i, f_out, f_out_name); } phase++; + only_existing = save_only_existing; + opt_ignore_existing = save_opt_ignore_existing; + if (verbose > 2) rprintf(FINFO,"generate_files phase=%d\n",phase); @@ -692,14 +690,20 @@ void generate_files(int f_out, struct file_list *flist, char *local_name, if (preserve_hard_links) do_hard_links(); - /* now we need to fix any directory permissions that were - * modified during the transfer */ - for (i = 0; i < flist->count; i++) { - struct file_struct *file = flist->files[i]; - if (!file->basename || !S_ISDIR(file->mode)) - continue; - recv_generator(local_name ? local_name : f_name(file), - file, i, -1, -1); + if ((need_retouch_dir_perms || need_retouch_dir_times) + && !list_only && !local_name && !dry_run) { + /* Now we need to fix any directory permissions that were + * modified during the transfer and/or re-set any tweaked + * modified-time values. */ + for (i = 0; i < flist->count; i++) { + struct file_struct *file = flist->files[i]; + if (!file->basename || !S_ISDIR(file->mode)) + continue; + if (!need_retouch_dir_times && file->mode & S_IWUSR) + continue; + recv_generator(local_name ? local_name : f_name(file), + flist, file, i, -1, -1); + } } if (verbose > 2)