X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9e4a8d29b58cebadc1ab4396eb595e71a71a411c..6cc119828892f4c28fc55274e11055f8c420515c:/receiver.c diff --git a/receiver.c b/receiver.c index d89348d5..d348cf87 100644 --- a/receiver.c +++ b/receiver.c @@ -21,7 +21,7 @@ #include "rsync.h" extern int verbose; -extern int dry_run; +extern int do_xfers; extern int am_daemon; extern int am_server; extern int do_progress; @@ -30,6 +30,7 @@ extern int log_format_has_i; extern int daemon_log_format_has_i; extern int csum_length; extern int read_batch; +extern int write_batch; extern int batch_gen_fd; extern int protocol_version; extern int relative_paths; @@ -44,6 +45,7 @@ extern int remove_sent_files; extern int module_id; extern int ignore_errors; extern int orig_umask; +extern int append_mode; extern int keep_partial; extern int checksum_seed; extern int inplace; @@ -53,7 +55,7 @@ extern char *log_format; extern char *tmpdir; extern char *partial_dir; extern char *basis_dir[]; - +extern struct file_list *the_file_list; extern struct filter_list_struct server_filter_list; #define SLOT_SIZE (16*1024) /* Desired size in bytes */ @@ -62,6 +64,7 @@ extern struct filter_list_struct server_filter_list; static uint32 **delayed_bits = NULL; static int delayed_slot_cnt = 0; +static int phase = 0; static void init_delayed_bits(int max_ndx) { @@ -210,6 +213,28 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, sum_init(checksum_seed); + if (append_mode) { + OFF_T j; + sum.flength = (OFF_T)sum.count * sum.blength; + if (sum.remainder) + sum.flength -= sum.blength - sum.remainder; + for (j = CHUNK_SIZE; j < sum.flength; j += CHUNK_SIZE) { + sum_update(map_ptr(mapbuf, offset, CHUNK_SIZE), + CHUNK_SIZE); + offset = j; + } + if (offset < sum.flength) { + int32 len = sum.flength - offset; + sum_update(map_ptr(mapbuf, offset, len), len); + offset = sum.flength; + } + if (fd != -1 && do_lseek(fd, offset, SEEK_SET) != offset) { + rsyserr(FERROR, errno, "lseek failed on %s", + full_fname(fname)); + exit_cleanup(RERR_FILEIO); + } + } + while ((i = recv_token(f_in, &data)) != 0) { if (do_progress) show_progress(offset, total_size); @@ -266,7 +291,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, continue; } } - if (fd != -1 && write_file(fd, map, len) != (int)len) + if (fd != -1 && map && write_file(fd, map, len) != (int)len) goto report_write_error; offset += len; } @@ -303,28 +328,60 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, } -static char *read_gen_name(int fd, char *dirname, char *buf) +static void discard_receive_data(int f_in, OFF_T length) { - int dlen; - - if (dirname) { - dlen = strlcpy(buf, dirname, MAXPATHLEN); - if (dlen != 1 || *buf != '/') - buf[dlen++] = '/'; - } else - dlen = 0; - - if (read_vstring(fd, buf + dlen, MAXPATHLEN - dlen) < 0) - return NULL; - if (strchr(buf + dlen, '/') != NULL) - return NULL; - return buf; + receive_data(f_in, NULL, -1, 0, NULL, -1, length); } +static void handle_delayed_updates(struct file_list *flist, char *local_name) +{ + char *fname, *partialptr, numbuf[4]; + int i; + + for (i = -1; (i = next_delayed_bit(i)) >= 0; ) { + struct file_struct *file = flist->files[i]; + fname = local_name ? local_name : f_name(file); + if ((partialptr = partial_dir_fname(fname)) != NULL) { + if (make_backups && !make_backup(fname)) + continue; + if (verbose > 2) { + rprintf(FINFO, "renaming %s to %s\n", + safe_fname(partialptr), + safe_fname(fname)); + } + if (do_rename(partialptr, fname) < 0) { + rsyserr(FERROR, errno, + "rename failed for %s (from %s)", + full_fname(fname), + safe_fname(partialptr)); + } else { + if (remove_sent_files + || (preserve_hard_links + && file->link_u.links)) { + SIVAL(numbuf, 0, i); + send_msg(MSG_SUCCESS,numbuf,4); + } + handle_partial_dir(partialptr, + PDIR_DELETE); + } + } + } +} -static void discard_receive_data(int f_in, OFF_T length) +static int get_next_gen_i(int batch_gen_fd, int next_gen_i, int desired_i) { - receive_data(f_in, NULL, -1, 0, NULL, -1, length); + while (next_gen_i < desired_i) { + if (next_gen_i >= 0) { + rprintf(FINFO, + "(No batched update for%s \"%s\")\n", + phase ? " resend of" : "", + safe_fname(f_name(the_file_list->files[next_gen_i]))); + } + next_gen_i = read_int(batch_gen_fd); + if (next_gen_i == -1) + next_gen_i = the_file_list->count; + } + return next_gen_i; } @@ -337,9 +394,9 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) int next_gen_i = -1; int fd1,fd2; STRUCT_STAT st; - int iflags; + int iflags, xlen; char *fname, fbuf[MAXPATHLEN]; - char template[MAXPATHLEN]; + char xname[MAXPATHLEN]; char fnametmp[MAXPATHLEN]; char *fnamecmp, *partialptr, numbuf[4]; char fnamecmpbuf[MAXPATHLEN]; @@ -349,7 +406,8 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) int save_make_backups = make_backups; int itemizing = am_daemon ? daemon_log_format_has_i : !am_server && log_format_has_i; - int i, recv_ok, phase = 0; + int max_phase = protocol_version >= 29 ? 2 : 1; + int i, recv_ok; if (verbose > 2) rprintf(FINFO,"recv_files(%d) starting\n",flist->count); @@ -368,25 +426,26 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) i = read_int(f_in); if (i == -1) { if (read_batch) { - if (next_gen_i != flist->count) - while (read_int(batch_gen_fd) != -1) {} + get_next_gen_i(batch_gen_fd, next_gen_i, + flist->count); next_gen_i = -1; } - - if (phase) + if (++phase > max_phase) break; - - phase = 1; csum_length = SUM_LENGTH; if (verbose > 2) rprintf(FINFO, "recv_files phase=%d\n", phase); + if (phase == 2 && delay_updates) + handle_delayed_updates(flist, local_name); send_msg(MSG_DONE, "", 0); if (keep_partial && !partial_dir) make_backups = 0; /* prevents double backup */ + append_mode = 0; continue; } - iflags = read_item_attrs(f_in, -1, i, fnametmp, &fnamecmp_type); + iflags = read_item_attrs(f_in, -1, i, &fnamecmp_type, + xname, &xlen); if (iflags == ITEM_IS_NEW) /* no-op packet */ continue; @@ -397,9 +456,15 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname)); if (!(iflags & ITEM_TRANSFER)) { - maybe_log_item(file, iflags, itemizing, fnametmp); + maybe_log_item(file, iflags, itemizing, xname); continue; } + if (phase == 2) { + rprintf(FERROR, + "got transfer request in phase 2 [%s]\n", + who_am_i()); + exit_cleanup(RERR_PROTOCOL); + } stats.current_file_index = i; stats.num_transferred_files++; @@ -412,20 +477,24 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) exit_cleanup(RERR_PROTOCOL); } - if (dry_run) { /* log the transfer */ + if (!do_xfers) { /* log the transfer */ if (!am_server && log_format) log_item(file, &stats, iflags, NULL); + if (read_batch) + discard_receive_data(f_in, file->length); + continue; + } + if (write_batch < 0) { + log_item(file, &stats, iflags, NULL); + if (!am_server) + discard_receive_data(f_in, file->length); continue; } if (read_batch) { - while (i > next_gen_i) { - next_gen_i = read_int(batch_gen_fd); - if (next_gen_i == -1) - next_gen_i = flist->count; - } + next_gen_i = get_next_gen_i(batch_gen_fd, next_gen_i, i); if (i < next_gen_i) { - rprintf(FINFO, "skipping update for \"%s\"\n", + rprintf(FINFO, "(Skipping batched update for \"%s\")\n", safe_fname(fname)); discard_receive_data(f_in, file->length); continue; @@ -447,8 +516,12 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) fnamecmp = get_backup_name(fname); break; case FNAMECMP_FUZZY: - fnamecmp = read_gen_name(f_in, file->dirname, - fnamecmpbuf); + if (file->dirname) { + pathjoin(fnamecmpbuf, MAXPATHLEN, + file->dirname, xname); + fnamecmp = fnamecmpbuf; + } else + fnamecmp = xname; break; default: if (fnamecmp_type >= basis_dir_cnt) { @@ -549,8 +622,6 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) continue; } - strlcpy(template, fnametmp, sizeof template); - /* we initially set the perms without the * setuid/setgid bits to ensure that there is no race * condition. They are then correctly updated after @@ -564,7 +635,8 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) * transferred, but that may not be the case with -R */ if (fd2 == -1 && relative_paths && errno == ENOENT && create_directory_path(fnametmp, orig_umask) == 0) { - strlcpy(fnametmp, template, sizeof fnametmp); + /* Get back to name with XXXXXX in it. */ + get_tmpname(fnametmp, fname); fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS); } if (fd2 == -1) { @@ -658,37 +730,8 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) } make_backups = save_make_backups; - if (delay_updates) { - for (i = -1; (i = next_delayed_bit(i)) >= 0; ) { - struct file_struct *file = flist->files[i]; - fname = local_name ? local_name : f_name(file); - partialptr = partial_dir_fname(fname); - if (partialptr) { - if (make_backups && !make_backup(fname)) - continue; - if (verbose > 2) { - rprintf(FINFO, "renaming %s to %s\n", - safe_fname(partialptr), - safe_fname(fname)); - } - if (do_rename(partialptr, fname) < 0) { - rsyserr(FERROR, errno, - "rename failed for %s (from %s)", - full_fname(fname), - safe_fname(partialptr)); - } else { - if (remove_sent_files - || (preserve_hard_links - && file->link_u.links)) { - SIVAL(numbuf, 0, i); - send_msg(MSG_SUCCESS,numbuf,4); - } - handle_partial_dir(partialptr, - PDIR_DELETE); - } - } - } - } + if (phase == 2 && delay_updates) /* for protocol_version < 29 */ + handle_delayed_updates(flist, local_name); if (verbose > 2) rprintf(FINFO,"recv_files finished\n");