#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;
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;
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;
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 */
static uint32 **delayed_bits = NULL;
static int delayed_slot_cnt = 0;
+static int phase = 0;
static void init_delayed_bits(int max_ndx)
{
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;
}
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);
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;
}
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
SIVAL(numbuf, 0, i);
send_msg(MSG_SUCCESS,numbuf,4);
}
- handle_partial_dir(partialptr,
- PDIR_DELETE);
+ handle_partial_dir(partialptr, PDIR_DELETE);
}
}
}
}
+static int get_next_gen_i(int batch_gen_fd, int next_gen_i, int desired_i)
+{
+ while (next_gen_i < desired_i) {
+ if (next_gen_i >= 0) {
+ rprintf(FINFO,
+ "(No batched update for%s \"%s\")\n",
+ phase ? " resend of" : "",
+ 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;
+}
+
/**
* main routine for receiver process.
int save_make_backups = make_backups;
int itemizing = am_daemon ? daemon_log_format_has_i
: !am_server && log_format_has_i;
- int phase = 0, max_phase = protocol_version >= 29 ? 2 : 1;
+ int max_phase = protocol_version >= 29 ? 2 : 1;
int i, recv_ok;
if (verbose > 2)
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 > max_phase)
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;
}
fname = local_name ? local_name : f_name_to(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);
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",
- safe_fname(fname));
+ rprintf(FINFO,
+ "(Skipping batched update for \"%s\")\n",
+ fname);
discard_receive_data(f_in, file->length);
continue;
}
/* 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));
continue;
}
- if (partialptr)
+ if (keep_partial)
cleanup_set(fnametmp, partialptr, file, fd1, fd2);
}
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,
}
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);
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff