extern int am_daemon;
extern int inc_recurse;
extern int blocking_io;
+extern int human_readable;
+extern int always_checksum;
extern int remove_source_files;
extern int output_needs_newline;
extern int need_messages_from_generator;
extern pid_t cleanup_child_pid;
extern unsigned int module_dirlen;
extern struct stats stats;
+extern char *stdout_format;
+extern char *logfile_format;
extern char *filesfrom_host;
extern char *partial_dir;
extern char *dest_option;
int daemon_over_rsh = 0;
mode_t orig_umask = 0;
int batch_gen_fd = -1;
+int sender_keeps_checksum = 0;
/* There's probably never more than at most 2 outstanding child processes,
* but set it higher, just in case. */
rprintf(FINFO,"Number of files transferred: %d\n",
stats.num_transferred_files);
rprintf(FINFO,"Total file size: %s bytes\n",
- human_num(stats.total_size));
+ big_num(stats.total_size, human_readable));
rprintf(FINFO,"Total transferred file size: %s bytes\n",
- human_num(stats.total_transferred_size));
+ big_num(stats.total_transferred_size, human_readable));
rprintf(FINFO,"Literal data: %s bytes\n",
- human_num(stats.literal_data));
+ big_num(stats.literal_data, human_readable));
rprintf(FINFO,"Matched data: %s bytes\n",
- human_num(stats.matched_data));
+ big_num(stats.matched_data, human_readable));
rprintf(FINFO,"File list size: %s\n",
- human_num(stats.flist_size));
+ big_num(stats.flist_size, human_readable));
if (stats.flist_buildtime) {
rprintf(FINFO,
"File list generation time: %.3f seconds\n",
(double)stats.flist_xfertime / 1000);
}
rprintf(FINFO,"Total bytes sent: %s\n",
- human_num(total_written));
+ big_num(total_written, human_readable));
rprintf(FINFO,"Total bytes received: %s\n",
- human_num(total_read));
+ big_num(total_read, human_readable));
}
if (INFO_GTE(STATS, 1)) {
rprintf(FCLIENT, "\n");
rprintf(FINFO,
"sent %s bytes received %s bytes %s bytes/sec\n",
- human_num(total_written), human_num(total_read),
+ big_num(total_written, human_readable),
+ big_num(total_read, human_readable),
human_dnum((total_written + total_read)/(0.5 + (endtime - starttime)), 2));
rprintf(FINFO, "total size is %s speedup is %.2f%s\n",
- human_num(stats.total_size),
+ big_num(stats.total_size, human_readable),
(double)stats.total_size / (total_written+total_read),
write_batch < 0 ? " (BATCH ONLY)" : dry_run ? " (DRY RUN)" : "");
}
if (am_sender) {
keep_dirlinks = 0; /* Must be disabled on the sender. */
+
+ if (always_checksum
+ && (log_format_has(stdout_format, 'C')
+ || log_format_has(logfile_format, 'C')))
+ sender_keeps_checksum = 1;
+
if (protocol_version >= 30)
io_start_multiplex_out();
else