struct stats stats;
-extern int csum_length;
-
extern int verbose;
static void report(int f)
extern int am_sender;
extern int am_daemon;
extern int do_stats;
+ extern int remote_version;
+ int send_stats;
if (am_daemon) {
- log_exit(0);
+ log_exit(0, __FILE__, __LINE__);
if (f == -1 || !am_sender) return;
}
- if (!verbose) return;
-
- if (am_server && !am_sender) return;
-
- if (am_server && am_sender) {
- write_longint(f,stats.total_read);
- write_longint(f,stats.total_written);
- write_longint(f,stats.total_size);
+ send_stats = verbose || (remote_version >= 20);
+ if (am_server) {
+ if (am_sender && send_stats) {
+ int64 w;
+ /* store total_written in a temporary
+ because write_longint changes it */
+ w = stats.total_written;
+ write_longint(f,stats.total_read);
+ write_longint(f,w);
+ write_longint(f,stats.total_size);
+ }
return;
}
-
- if (!am_sender) {
+
+ /* this is the client */
+
+ if (!am_sender && send_stats) {
int64 r;
stats.total_written = read_longint(f);
+ /* store total_read in a temporary, read_longint changes it */
r = read_longint(f);
stats.total_size = read_longint(f);
stats.total_read = r;
}
if (do_stats) {
+ if (!am_sender && !send_stats) {
+ /* missing the bytes written by the generator */
+ rprintf(FINFO, "\nCannot show stats as receiver because remote protocol version is less than 20\n");
+ rprintf(FINFO, "Use --stats -v to show stats\n");
+ return;
+ }
rprintf(FINFO,"\nNumber of files: %d\n", stats.num_files);
rprintf(FINFO,"Number of files transferred: %d\n",
stats.num_transferred_files);
(double)stats.total_read);
}
- rprintf(FINFO,"wrote %.0f bytes read %.0f bytes %.2f bytes/sec\n",
- (double)stats.total_written,
- (double)stats.total_read,
- (stats.total_written+stats.total_read)/(0.5 + (t-starttime)));
- rprintf(FINFO,"total size is %.0f speedup is %.2f\n",
- (double)stats.total_size,
- (1.0*stats.total_size)/(stats.total_written+stats.total_read));
+ if (verbose || do_stats) {
+ rprintf(FINFO,"wrote %.0f bytes read %.0f bytes %.2f bytes/sec\n",
+ (double)stats.total_written,
+ (double)stats.total_read,
+ (stats.total_written+stats.total_read)/(0.5 + (t-starttime)));
+ rprintf(FINFO,"total size is %.0f speedup is %.2f\n",
+ (double)stats.total_size,
+ (1.0*stats.total_size)/(stats.total_written+stats.total_read));
+ }
fflush(stdout);
fflush(stderr);
if (verbose > 2)
rprintf(FINFO,"get_local_name count=%d %s\n",
- flist->count, name);
+ flist->count, NS(name));
+
+ if (!name)
+ return NULL;
if (do_stat(name,&st) == 0) {
if (S_ISDIR(st.st_mode)) {
return name;
}
- if (flist->count == 1)
+ if (flist->count <= 1)
return name;
- if (!name)
- return NULL;
-
if (do_mkdir(name,0777 & ~orig_umask) != 0) {
rprintf(FERROR,"mkdir %s : %s (1)\n",name,strerror(errno));
exit_cleanup(RERR_FILEIO);
char *local_name=NULL;
char *dir = NULL;
extern int delete_mode;
+ extern int delete_excluded;
extern int am_daemon;
if (verbose > 2)
}
}
- if (delete_mode)
+ if (delete_mode && !delete_excluded)
recv_exclude_list(f_in);
flist = recv_file_list(f_in);
- if (!flist || flist->count == 0) {
- rprintf(FERROR,"server_recv: nothing to do\n");
+ if (!flist) {
+ rprintf(FERROR,"server_recv: recv_file_list error\n");
exit_cleanup(RERR_FILESELECT);
}
if (am_sender) {
extern int cvs_exclude;
extern int delete_mode;
+ extern int delete_excluded;
if (cvs_exclude)
add_cvs_excludes();
- if (delete_mode)
+ if (delete_mode && !delete_excluded)
send_exclude_list(f_out);
flist = send_file_list(f_out,argc,argv);
if (verbose > 3)
extern int local_server;
extern int am_sender;
extern char *shell_cmd;
+ extern int rsync_port;
if (strncasecmp(URL_PREFIX, argv[0], strlen(URL_PREFIX)) == 0) {
char *host, *path;
} else {
path="";
}
+ p = strchr(host,':');
+ if (p) {
+ rsync_port = atoi(p+1);
+ *p = 0;
+ }
return start_socket_client(host, path, argc-1, argv+1);
}
carried across */
orig_umask = (int)umask(0);
- if (!parse_arguments(argc, argv)) {
+ if (!parse_arguments(argc, argv, 1)) {
exit_cleanup(RERR_SYNTAX);
}
signal(SIGHUP,SIGNAL_CAST sig_int);
signal(SIGTERM,SIGNAL_CAST sig_int);
+ /* Initialize push_dir here because on some old systems getcwd
+ (implemented by forking "pwd" and reading its output) doesn't
+ work when there are other child processes. Also, on all systems
+ that implement getcwd that way "pwd" can't be found after chroot. */
+ push_dir(NULL,0);
+
if (am_daemon) {
return daemon_main();
}