X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7e38410e47a05b2b97c58212d08a1d65c8c452b4..e95538ca2c8fdecd66a112635aa30077419af685:/generator.c diff --git a/generator.c b/generator.c index 4a22581d..88e369e6 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) { @@ -117,7 +120,7 @@ static int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st) * * 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; @@ -128,7 +131,7 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len) blength = BLOCK_SIZE; else { int32 c; - uint64 l; + int64 l; int cnt; for (c = 1, l = len, cnt = 0; l >>= 2; c <<= 1, cnt++) {} if (cnt >= 31 || c >= MAX_BLOCK_SIZE) @@ -137,7 +140,7 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len) blength = 0; do { blength |= c; - if (len < (uint64)blength * blength) + if (len < (int64)blength * blength) blength &= ~c; c >>= 1; } while (c >= 8); /* round to multiple of 8 */ @@ -151,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--) {} @@ -233,7 +236,8 @@ static void generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy) * @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, +static void recv_generator(char *fname, struct file_list *flist, + struct file_struct *file, int i, int f_out, int f_out_name) { int fd = -1, f_copy = -1; @@ -250,9 +254,9 @@ static void recv_generator(char *fname, struct file_struct *file, int i, if (verbose > 2) rprintf(FINFO, "recv_generator(%s,%d)\n", safe_fname(fname), i); - 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)); @@ -292,18 +296,15 @@ 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)) { 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)); @@ -314,6 +315,9 @@ static void recv_generator(char *fname, struct file_struct *file, int i, 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 + && (file->flags & FLAG_DEL_START)) + delete_in_dir(flist, fname); return; } else if (max_size && file->length > max_size) { if (verbose > 1) @@ -543,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; } @@ -608,6 +612,8 @@ 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; if (verbose > 2) { rprintf(FINFO, "generator starting pid=%ld count=%d\n", @@ -637,14 +643,13 @@ void generate_files(int f_out, struct file_list *flist, char *local_name, them. This is then fixed after the files are transferred */ 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); } phase++; @@ -661,7 +666,7 @@ 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++; @@ -676,14 +681,19 @@ 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) { + /* 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)