X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/72c19bb3de47c40fcd8d950805ed22689064db7c..7d5acf1d4472af7a2f80c3b217e1cb8bdffc312d:/generator.c diff --git a/generator.c b/generator.c index 6d1f3491..6d62e06f 100644 --- a/generator.c +++ b/generator.c @@ -36,6 +36,8 @@ extern int preserve_uid; extern int preserve_gid; extern int update_only; extern int opt_ignore_existing; +extern int inplace; +extern int make_backups; extern int csum_length; extern int ignore_times; extern int size_only; @@ -198,7 +200,7 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len) * * Generate approximately one checksum every block_len bytes. */ -static void generate_and_send_sums(int fd, OFF_T len, int f_out) +static void generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy) { size_t i; struct map_struct *mapbuf; @@ -220,6 +222,9 @@ static void generate_and_send_sums(int fd, OFF_T len, int f_out) uint32 sum1 = get_checksum1(map, n1); char sum2[SUM_LENGTH]; + if (f_copy >= 0) + full_write(f_copy, map, n1); + get_checksum2(map, n1, sum2); if (verbose > 3) { @@ -249,13 +254,15 @@ static void generate_and_send_sums(int fd, OFF_T len, int f_out) * out. It might be wrong. */ static void recv_generator(char *fname, struct file_struct *file, int i, - int f_out) + int f_out, int f_out_name) { - int fd; + int fd = -1, f_copy = -1; STRUCT_STAT st, partial_st; + struct file_struct *back_file = NULL; int statret, stat_errno; - char *fnamecmp, *partialptr; + char *fnamecmp, *partialptr, *backupptr = NULL; char fnamecmpbuf[MAXPATHLEN]; + uchar fnamecmp_type; if (list_only) return; @@ -379,7 +386,6 @@ static void recv_generator(char *fname, struct file_struct *file, int i, return; } -#ifdef HAVE_MKNOD if (am_root && preserve_devices && IS_DEVICE(file->mode)) { if (statret != 0 || st.st_mode != file->mode || @@ -405,7 +411,6 @@ static void recv_generator(char *fname, struct file_struct *file, int i, } return; } -#endif if (preserve_hard_links && hard_link_check(file, HL_CHECK_MASTER)) return; @@ -417,6 +422,7 @@ static void recv_generator(char *fname, struct file_struct *file, int i, } fnamecmp = fname; + fnamecmp_type = FNAMECMP_FNAME; if (statret == -1 && compare_dest != NULL) { /* try the file at compare_dest instead */ @@ -433,10 +439,14 @@ static void recv_generator(char *fname, struct file_struct *file, int i, safe_fname(fname)); } fnamecmp = fnamecmpbuf; + fnamecmp_type = FNAMECMP_CMPDEST; } } else #endif + { fnamecmp = fnamecmpbuf; + fnamecmp_type = FNAMECMP_CMPDEST; + } statret = 0; } } @@ -459,11 +469,9 @@ static void recv_generator(char *fname, struct file_struct *file, int i, if (statret == -1) { if (preserve_hard_links && hard_link_check(file, HL_SKIP)) return; - if (stat_errno == ENOENT) { - write_int(f_out,i); - if (!dry_run && !read_batch) - write_sum_head(f_out, NULL); - } else if (verbose > 1) { + if (stat_errno == ENOENT) + goto notify_others; + if (verbose > 1) { rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s", full_fname(fname)); @@ -471,13 +479,13 @@ static void recv_generator(char *fname, struct file_struct *file, int i, return; } - if (opt_ignore_existing && fnamecmp == fname) { + if (opt_ignore_existing && fnamecmp_type == FNAMECMP_FNAME) { if (verbose > 1) rprintf(FINFO, "%s exists\n", safe_fname(fname)); return; } - if (update_only && fnamecmp == fname + 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)); @@ -485,26 +493,23 @@ static void recv_generator(char *fname, struct file_struct *file, int i, } if (skip_file(fnamecmp, file, &st)) { - if (fnamecmp == fname) + if (fnamecmp_type == FNAMECMP_FNAME) set_perms(fname, file, &st, PERMS_REPORT); return; } prepare_to_open: - if (dry_run || read_batch) { - write_int(f_out,i); - return; - } - - if (whole_file > 0) { - write_int(f_out,i); - write_sum_head(f_out, NULL); - return; + if (dry_run || whole_file > 0) { + statret = -1; + goto notify_others; } + if (read_batch) + goto notify_others; if (partialptr) { st = partial_st; fnamecmp = partialptr; + fnamecmp_type = FNAMECMP_PARTIAL_DIR; } /* open the file */ @@ -513,12 +518,39 @@ prepare_to_open: if (fd == -1) { rsyserr(FERROR, errno, "failed to open %s, continuing", full_fname(fnamecmp)); + pretend_missing: /* pretend the file didn't exist */ if (preserve_hard_links && hard_link_check(file, HL_SKIP)) return; - write_int(f_out,i); - write_sum_head(f_out, NULL); - return; + statret = -1; + goto notify_others; + } + + if (inplace && make_backups) { + if (!(backupptr = get_backup_name(fname))) { + close(fd); + return; + } + if (!(back_file = make_file(fname, NULL, NO_EXCLUDES))) { + close(fd); + goto pretend_missing; + } + if (robust_unlink(backupptr) && errno != ENOENT) { + rsyserr(FERROR, errno, "unlink %s", + full_fname(backupptr)); + free(back_file); + close(fd); + return; + } + if ((f_copy = do_open(backupptr, + O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) { + rsyserr(FERROR, errno, "open %s", + full_fname(backupptr)); + free(back_file); + close(fd); + return; + } + fnamecmp_type = FNAMECMP_BACKUP; } if (verbose > 3) { @@ -529,14 +561,35 @@ prepare_to_open: if (verbose > 2) rprintf(FINFO, "generating and sending sums for %d\n", i); - write_int(f_out,i); - generate_and_send_sums(fd, st.st_size, f_out); +notify_others: + write_int(f_out, i); + if (f_out_name >= 0) + write_byte(f_out_name, fnamecmp_type); - close(fd); + if (dry_run || 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", + fname, backupptr); + } + free(back_file); + } + + close(fd); + } else + write_sum_head(f_out, NULL); } -void generate_files(int f_out, struct file_list *flist, char *local_name) +void generate_files(int f_out, struct file_list *flist, char *local_name, + int f_out_name) { int i; int phase = 0; @@ -577,7 +630,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) } recv_generator(local_name ? local_name : f_name_to(file, fbuf), - file, i, f_out); + file, i, f_out, f_out_name); } phase++; @@ -594,7 +647,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); + file, i, f_out, f_out_name); } phase++; @@ -613,7 +666,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) if (!file->basename || !S_ISDIR(file->mode)) continue; recv_generator(local_name ? local_name : f_name(file), - file, i, -1); + file, i, -1, -1); } if (verbose > 2)