X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b10917a426d5e5b6815a74584acac8c25c0df273..4a4d2b1ba0871c185acb4d7b8db793ea9474e7e7:/receiver.c diff --git a/receiver.c b/receiver.c index abe1f663..30cdc36c 100644 --- a/receiver.c +++ b/receiver.c @@ -45,6 +45,8 @@ extern int remove_sent_files; extern int module_id; extern int ignore_errors; extern int orig_umask; +extern int append_mode; +extern int sparse_files; extern int keep_partial; extern int checksum_seed; extern int inplace; @@ -171,8 +173,7 @@ static int get_tmpname(char *fnametmp, char *fname) maxname = MIN(MAXPATHLEN - 7 - length, NAME_MAX - 8); if (maxname < 1) { - rprintf(FERROR, "temporary filename too long: %s\n", - safe_fname(fname)); + rprintf(FERROR, "temporary filename too long: %s\n", fname); fnametmp[0] = '\0'; return 0; } @@ -205,13 +206,39 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, mapbuf = map_file(fd_r, size_r, read_size, sum.blength); if (verbose > 2) { rprintf(FINFO, "recv mapped %s of size %.0f\n", - safe_fname(fname_r), (double)size_r); + fname_r, (double)size_r); } } else mapbuf = NULL; 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) { + if (do_progress) + show_progress(offset, total_size); + sum_update(map_ptr(mapbuf, offset, CHUNK_SIZE), + CHUNK_SIZE); + offset = j; + } + if (offset < sum.flength) { + int32 len = sum.flength - offset; + if (do_progress) + show_progress(offset, total_size); + 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); @@ -317,20 +344,20 @@ static void handle_delayed_updates(struct file_list *flist, char *local_name) for (i = -1; (i = next_delayed_bit(i)) >= 0; ) { struct file_struct *file = flist->files[i]; - fname = local_name ? local_name : f_name(file); + fname = local_name ? local_name : f_name(file, NULL); 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)); + partialptr, fname); } + /* We don't use robust_rename() here because the + * partial-dir must be on the same drive. */ if (do_rename(partialptr, fname) < 0) { rsyserr(FERROR, errno, "rename failed for %s (from %s)", - full_fname(fname), - safe_fname(partialptr)); + full_fname(fname), partialptr); } else { if (remove_sent_files || (preserve_hard_links @@ -338,8 +365,7 @@ static void handle_delayed_updates(struct file_list *flist, char *local_name) SIVAL(numbuf, 0, i); send_msg(MSG_SUCCESS,numbuf,4); } - handle_partial_dir(partialptr, - PDIR_DELETE); + handle_partial_dir(partialptr, PDIR_DELETE); } } } @@ -352,7 +378,7 @@ static int get_next_gen_i(int batch_gen_fd, int next_gen_i, int desired_i) rprintf(FINFO, "(No batched update for%s \"%s\")\n", phase ? " resend of" : "", - safe_fname(f_name(the_file_list->files[next_gen_i]))); + f_name(the_file_list->files[next_gen_i], NULL)); } next_gen_i = read_int(batch_gen_fd); if (next_gen_i == -1) @@ -417,6 +443,10 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) send_msg(MSG_DONE, "", 0); if (keep_partial && !partial_dir) make_backups = 0; /* prevents double backup */ + if (append_mode) { + append_mode = 0; + sparse_files = 0; + } continue; } @@ -426,10 +456,10 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) continue; file = flist->files[i]; - fname = local_name ? local_name : f_name_to(file, fbuf); + fname = local_name ? local_name : f_name(file, fbuf); if (verbose > 2) - rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname)); + rprintf(FINFO, "recv_files(%s)\n", fname); if (!(iflags & ITEM_TRANSFER)) { maybe_log_item(file, iflags, itemizing, xname); @@ -470,8 +500,9 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) if (read_batch) { next_gen_i = get_next_gen_i(batch_gen_fd, next_gen_i, i); if (i < next_gen_i) { - rprintf(FINFO, "(Skipping batched update for \"%s\")\n", - safe_fname(fname)); + rprintf(FINFO, + "(Skipping batched update for \"%s\")\n", + fname); discard_receive_data(f_in, file->length); continue; } @@ -581,7 +612,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) /* We now check to see if we are writing file "inplace" */ if (inplace) { - fd2 = do_open(fname, O_WRONLY|O_CREAT, 0); + fd2 = do_open(fname, O_WRONLY|O_CREAT, 0600); if (fd2 == -1) { rsyserr(FERROR, errno, "open %s failed", full_fname(fname)); @@ -624,7 +655,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) continue; } - if (partialptr) + if (keep_partial) cleanup_set(fnametmp, partialptr, file, fd1, fd2); } @@ -632,7 +663,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) if (log_before_transfer) log_item(file, &initial_stats, iflags, NULL); else if (!am_server && verbose && do_progress) - rprintf(FINFO, "%s\n", safe_fname(fname)); + rprintf(FINFO, "%s\n", fname); /* recv file data */ recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size, @@ -650,15 +681,18 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) } if ((recv_ok && (!delay_updates || !partialptr)) || inplace) { - finish_transfer(fname, fnametmp, file, recv_ok, 1); - if (partialptr != fname && fnamecmp == partialptr) { + if (partialptr == fname || *partial_dir == '/') + partialptr = NULL; + finish_transfer(fname, fnametmp, partialptr, + file, recv_ok, 1); + if (fnamecmp == partialptr) { do_unlink(partialptr); handle_partial_dir(partialptr, PDIR_DELETE); } } else if (keep_partial && partialptr && handle_partial_dir(partialptr, PDIR_CREATE)) { - finish_transfer(partialptr, fnametmp, file, recv_ok, - !partial_dir); + finish_transfer(partialptr, fnametmp, NULL, + file, recv_ok, !partial_dir); if (delay_updates && recv_ok) { set_delayed_bit(i); recv_ok = -1; @@ -695,8 +729,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) } rprintf(msgtype, "%s: %s failed verification -- update %s%s.\n", - errstr, safe_fname(fname), - keptstr, redostr); + errstr, fname, keptstr, redostr); } if (!phase) { SIVAL(numbuf, 0, i);