extern int am_server;
extern int am_daemon;
extern int protocol_version;
+extern int make_backups;
+extern struct stats stats;
/**
int i;
OFF_T offset = 0;
- s = new(struct sum_struct);
- if (!s) out_of_memory("receive_sums");
+ if (!(s = new(struct sum_struct)))
+ out_of_memory("receive_sums");
read_sum_head(f, s);
s->sums = NULL;
if (verbose > 3) {
- rprintf(FINFO, "count=%ld n=%u rem=%u\n",
- (long)s->count, s->blength, s->remainder);
+ rprintf(FINFO, "count=%.0f n=%ld rem=%ld\n",
+ (double)s->count, (long)s->blength, (long)s->remainder);
}
if (s->count == 0)
return(s);
- s->sums = new_array(struct sum_buf, s->count);
- if (!s->sums) out_of_memory("receive_sums");
+ if (!(s->sums = new_array(struct sum_buf, s->count)))
+ out_of_memory("receive_sums");
- for (i = 0; i < (int) s->count; i++) {
+ for (i = 0; i < (int)s->count; i++) {
s->sums[i].sum1 = read_int(f);
read_buf(f, s->sums[i].sum2, s->s2length);
s->sums[i].offset = offset;
- s->sums[i].i = i;
+ s->sums[i].flags = 0;
- if (i == (int) s->count-1 && s->remainder != 0) {
+ if (i == (int)s->count-1 && s->remainder != 0)
s->sums[i].len = s->remainder;
- } else {
+ else
s->sums[i].len = s->blength;
- }
offset += s->sums[i].len;
- if (verbose > 3)
- rprintf(FINFO, "chunk[%d] len=%d offset=%.0f sum1=%08x\n",
- i, s->sums[i].len, (double)s->sums[i].offset, s->sums[i].sum1);
+ if (verbose > 3) {
+ rprintf(FINFO,
+ "chunk[%d] len=%d offset=%.0f sum1=%08x\n",
+ i, s->sums[i].len, (double)s->sums[i].offset,
+ s->sums[i].sum1);
+ }
}
s->flength = offset;
struct sum_struct *s;
struct map_struct *mbuf = NULL;
STRUCT_STAT st;
- char fname[MAXPATHLEN];
+ char *fname2, fname[MAXPATHLEN];
int i;
struct file_struct *file;
int phase = 0;
- extern struct stats stats;
struct stats initial_stats;
- extern int write_batch;
- extern int read_batch;
- int checksums_match;
- int buff_len;
- char buff[CHUNK_SIZE];
+ int save_make_backups = make_backups;
int j;
- int done;
if (verbose > 2)
rprintf(FINFO, "send_files starting\n");
write_int(f_out, -1);
if (verbose > 2)
rprintf(FINFO, "send_files phase=%d\n", phase);
+ /* For inplace: redo phase turns off the backup
+ * flag so that we do a regular inplace send. */
+ make_backups = 0;
continue;
}
break;
fname[offset++] = '/';
} else
offset = 0;
- f_name_to(file, fname + offset);
+ fname2 = f_name_to(file, fname + offset);
if (verbose > 2)
rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
if (dry_run) {
- if (!am_server && verbose) {
- rprintf(FINFO, "%s\n", fname+offset);
- }
+ if (!am_server && verbose) /* log the transfer */
+ rprintf(FINFO, "%s\n", safe_fname(fname2));
write_int(f_out, i);
continue;
}
initial_stats = stats;
- s = receive_sums(f_in);
- if (!s) {
+ if (!(s = receive_sums(f_in))) {
io_error |= IOERR_GENERAL;
rprintf(FERROR, "receive_sums failed\n");
return;
}
- if (write_batch)
- write_batch_csum_info(&i, s);
-
- if (!read_batch) {
- fd = do_open(fname, O_RDONLY, 0);
- if (fd == -1) {
- if (errno == ENOENT) {
- enum logcode c = am_daemon
- && protocol_version < 28 ? FERROR
- : FINFO;
- io_error |= IOERR_VANISHED;
- rprintf(c, "file has vanished: %s\n",
- full_fname(fname));
- } else {
- io_error |= IOERR_GENERAL;
- rsyserr(FERROR, errno,
- "send_files failed to open %s",
- full_fname(fname));
- }
- free_sums(s);
- continue;
- }
-
- /* map the local file */
- if (do_fstat(fd, &st) != 0) {
+ fd = do_open(fname, O_RDONLY, 0);
+ if (fd == -1) {
+ if (errno == ENOENT) {
+ enum logcode c = am_daemon
+ && protocol_version < 28 ? FERROR
+ : FINFO;
+ io_error |= IOERR_VANISHED;
+ rprintf(c, "file has vanished: %s\n",
+ full_fname(fname));
+ } else {
io_error |= IOERR_GENERAL;
- rsyserr(FERROR, errno, "fstat failed");
- free_sums(s);
- close(fd);
- return;
- }
-
- mbuf = st.st_size ? map_file(fd, st.st_size) : NULL;
-
- if (verbose > 2) {
- rprintf(FINFO, "send_files mapped %s of size %.0f\n",
- fname, (double)st.st_size);
+ rsyserr(FERROR, errno,
+ "send_files failed to open %s",
+ full_fname(fname));
}
+ free_sums(s);
+ continue;
+ }
- write_int(f_out, i);
+ /* map the local file */
+ if (do_fstat(fd, &st) != 0) {
+ io_error |= IOERR_GENERAL;
+ rsyserr(FERROR, errno, "fstat failed");
+ free_sums(s);
+ close(fd);
+ return;
+ }
- if (write_batch)
- write_batch_delta_file((char *)&i, sizeof i);
+ if (st.st_size) {
+ OFF_T map_size = MAX((OFF_T)s->blength * 3, MAX_MAP_SIZE);
+ mbuf = map_file(fd, st.st_size, map_size, s->blength);
+ } else
+ mbuf = NULL;
- write_sum_head(f_out, s);
+ if (verbose > 2) {
+ rprintf(FINFO, "send_files mapped %s of size %.0f\n",
+ safe_fname(fname), (double)st.st_size);
}
- if (verbose > 2 && !read_batch)
- rprintf(FINFO, "calling match_sums %s\n", fname);
+ write_int(f_out, i);
+ write_sum_head(f_out, s);
- if (!am_server && verbose) {
- rprintf(FINFO, "%s\n", fname+offset);
+ if (verbose > 2) {
+ rprintf(FINFO, "calling match_sums %s\n",
+ safe_fname(fname));
}
+ if (!am_server && verbose) /* log the transfer */
+ rprintf(FINFO, "%s\n", safe_fname(fname2));
+
set_compression(fname);
- if (read_batch) {
- /* read checksums originally computed on sender side */
- read_batch_csum_info(i, s, &checksums_match);
- if (checksums_match) {
- read_batch_delta_file((char*)&j, sizeof (int));
- if (j != i) { /* if flist index entries don't match*/
- rprintf(FINFO, "index mismatch in send_files\n");
- rprintf(FINFO, "read index = %d flist ndx = %d\n", j, i);
- close_batch_delta_file();
- close_batch_csums_file();
- exit_cleanup(1);
- } else {
- write_int(f_out, j);
- write_sum_head(f_out, s);
- done = 0;
- while (!done) {
- read_batch_delta_file((char*)&buff_len, sizeof (int));
- write_int(f_out, buff_len);
- if (buff_len == 0) {
- done = 1;
- } else {
- if (buff_len > 0) {
- read_batch_delta_file(buff, buff_len);
- write_buf(f_out, buff, buff_len);
- }
- }
- }
- read_batch_delta_file(buff, MD4_SUM_LENGTH);
- write_buf(f_out, buff, MD4_SUM_LENGTH);
-
- }
- } else { /* not checksum match */
- rprintf (FINFO, "readbatch & checksums don't match\n");
- rprintf (FINFO, "filename=%s is being skipped\n", fname);
- continue;
- }
- } else { /* not read_batch */
- match_sums(f_out, s, mbuf, st.st_size);
- log_send(file, &initial_stats);
- }
+ match_sums(f_out, s, mbuf, st.st_size);
+ log_send(file, &initial_stats);
- if (!read_batch) {
- if (mbuf) {
- j = unmap_file(mbuf);
- if (j) {
- io_error |= IOERR_GENERAL;
- rsyserr(FERROR, j,
- "read errors mapping %s",
- full_fname(fname));
- }
+ if (mbuf) {
+ j = unmap_file(mbuf);
+ if (j) {
+ io_error |= IOERR_GENERAL;
+ rsyserr(FERROR, j,
+ "read errors mapping %s",
+ full_fname(fname));
}
- close(fd);
}
+ close(fd);
free_sums(s);
- if (verbose > 2)
- rprintf(FINFO, "sender finished %s\n", fname);
+ if (verbose > 2) {
+ rprintf(FINFO, "sender finished %s\n",
+ safe_fname(fname));
+ }
}
+ make_backups = save_make_backups;
if (verbose > 2)
rprintf(FINFO, "send files finished\n");
match_report();
write_int(f_out, -1);
- if (write_batch || read_batch) {
- close_batch_csums_file();
- close_batch_delta_file();
- }
-
}
-
-
-
-
-
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff