extern int need_messages_from_generator;
extern int kluge_around_eof;
extern int do_stats;
-extern int log_got_error;
+extern int got_xfer_error;
extern int module_id;
extern int copy_links;
extern int copy_dirlinks;
extern int write_batch;
extern int batch_fd;
extern int filesfrom_fd;
+extern int connect_timeout;
extern pid_t cleanup_child_pid;
extern struct stats stats;
extern char *filesfrom_host;
"sent %s bytes received %s bytes %s bytes/sec\n",
human_num(total_written), human_num(total_read),
human_dnum((total_written + total_read)/(0.5 + (endtime - starttime)), 2));
- rprintf(FINFO, "total size is %s speedup is %.2f\n",
+ rprintf(FINFO, "total size is %s speedup is %.2f%s\n",
human_num(stats.total_size),
- (double)stats.total_size / (total_written+total_read));
+ (double)stats.total_size / (total_written+total_read),
+ dry_run ? " (DRY RUN)" : "");
}
fflush(stdout);
if (sanitize_paths) {
char **dir;
for (dir = basis_dir; *dir; dir++) {
- *dir = sanitize_path(NULL, *dir, NULL, curr_dir_depth, NULL);
+ *dir = sanitize_path(NULL, *dir, NULL, curr_dir_depth);
}
if (partial_dir) {
- partial_dir = sanitize_path(NULL, partial_dir, NULL, curr_dir_depth, NULL);
+ partial_dir = sanitize_path(NULL, partial_dir, NULL, curr_dir_depth);
}
}
fix_basis_dirs();
exit_cleanup(RERR_SYNTAX);
}
+ if (connect_timeout) {
+ rprintf(FERROR, "The --contimeout option may only be "
+ "used when connecting to an rsync daemon.\n");
+ exit_cleanup(RERR_SYNTAX);
+ }
+
if (shell_machine) {
p = strrchr(shell_machine,'@');
if (p) {
if (!am_server)
output_summary();
close_all();
- if (log_got_error)
+ if (got_xfer_error)
_exit(RERR_PARTIAL);
_exit(0);
}