flist_expand(flist);
- if (write_batch) /* dw */
+ if (write_batch)
file->flags = FLAG_DELETE;
if (file->basename[0]) {
io_end_buffering();
stats.flist_size = stats.total_written - start_write;
stats.num_files = flist->count;
- if (write_batch) /* dw */
+ if (write_batch)
write_batch_flist_info(flist->count, flist->files);
}
report(f_out);
if (protocol_version >= 24) {
/* final goodbye message */
- read_int(f_in);
- }
+ read_int(f_in);
+ }
io_flush();
exit_cleanup(0);
}
send_exclude_list(f_out);
if (remote_filesfrom_file)
filesfrom_fd = f_in;
- if (!read_batch) /* dw -- don't write to pipe */
+ if (!read_batch) /* don't write to pipe */
flist = send_file_list(f_out,argc,argv);
if (verbose > 3)
rprintf(FINFO,"file list sent\n");
void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
{
char file_sum[MD4_SUM_LENGTH];
- extern int write_batch; /* dw */
+ extern int write_batch;
last_match = 0;
false_alarms = 0;
if (verbose > 2)
rprintf(FINFO,"sending file_sum\n");
write_buf(f,file_sum,MD4_SUM_LENGTH);
- if (write_batch) /* dw */
+ if (write_batch)
write_batch_delta_file(file_sum, MD4_SUM_LENGTH);
if (targets) {
int phase = 0;
extern struct stats stats;
struct stats initial_stats;
- extern int write_batch; /* dw */
- extern int read_batch; /* dw */
- int checksums_match; /* dw */
- int buff_len; /* dw */
- char buff[CHUNK_SIZE]; /* dw */
- int j; /* dw */
- int done; /* dw */
+ extern int write_batch;
+ extern int read_batch;
+ int checksums_match;
+ int buff_len;
+ char buff[CHUNK_SIZE];
+ int j;
+ int done;
if (verbose > 2)
rprintf(FINFO, "send_files starting\n");
if (errno == ENOENT) {
io_error |= IOERR_VANISHED;
rprintf(FINFO, "file has vanished: %s\n",
- full_fname(fname));
+ full_fname(fname));
} else {
io_error |= IOERR_GENERAL;
rprintf(FERROR, "send_files failed to open %s: %s\n",
set_compression(fname);
- if (read_batch) { /* dw */
+ if (read_batch) {
/* read checksums originally computed on sender side */
read_batch_csum_info(i, s, &checksums_match);
if (checksums_match) {
log_send(file, &initial_stats);
}
- if (!read_batch) { /* dw */
+ if (!read_batch) {
if (buf) {
j = unmap_file(buf);
if (j) {
match_report();
write_int(f_out, -1);
- if (write_batch || read_batch) { /* dw */
+ if (write_batch || read_batch) {
close_batch_csums_file();
close_batch_delta_file();
}