X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/6c29af225112d25581ec4aaa25666a11cf122c56..f7b9377863c25088412a704cc0834460d0d6c86b:/main.c

diff --git a/main.c b/main.c
index 188cf41d..217ddf41 100644
--- a/main.c
+++ b/main.c
@@ -20,7 +20,8 @@
 #include "rsync.h"
 
 time_t starttime = 0;
-int64 total_size = 0;
+
+struct stats stats;
 
 extern int csum_length;
 
@@ -28,43 +29,68 @@ extern int verbose;
 
 static void report(int f)
 {
-	int64 in,out,tsize;
 	time_t t = time(NULL);
 	extern int am_server;
 	extern int am_sender;
 	extern int am_daemon;
+	extern int do_stats;
 
 	if (am_daemon) {
-		rprintf(FINFO, "wrote %.0f bytes  read %.0f bytes  total size %.0f\n",
-			(double)write_total(),(double)read_total(),
-			(double)total_size);
+		syslog(LOG_INFO,"wrote %.0f bytes  read %.0f bytes  total size %.0f\n",
+		       (double)stats.total_written,
+		       (double)stats.total_read,
+		       (double)stats.total_size);
 		if (f == -1 || !am_sender) return;
 	}
 
 	if (!verbose) return;
 
+	if (am_server && !am_sender) return;
+
 	if (am_server && am_sender) {
-		write_longint(f,read_total());
-		write_longint(f,write_total());
-		write_longint(f,total_size);
-		write_flush(f);
+		write_longint(f,stats.total_read);
+		write_longint(f,stats.total_written);
+		write_longint(f,stats.total_size);
 		return;
 	}
     
-	if (am_sender) {
-		in = read_total();
-		out = write_total();
-		tsize = total_size;
-	} else {
-		out = read_longint(f);
-		in = read_longint(f);
-		tsize = read_longint(f);
+	if (!am_sender) {
+		int64 r;
+		stats.total_written = read_longint(f);
+		r = read_longint(f);
+		stats.total_size = read_longint(f);
+		stats.total_read = r;
+	}
+
+	if (do_stats) {
+		printf("\nNumber of files: %d\n", stats.num_files);
+		printf("Number of files transferred: %d\n", 
+		       stats.num_transferred_files);
+		printf("Total file size: %.0f bytes\n", 
+		       (double)stats.total_size);
+		printf("Total transferred file size: %.0f bytes\n", 
+		       (double)stats.total_transferred_size);
+		printf("Literal data: %.0f bytes\n", 
+		       (double)stats.literal_data);
+		printf("Matched data: %.0f bytes\n", 
+		       (double)stats.matched_data);
+		printf("File list size: %d\n", stats.flist_size);
+		printf("Total bytes written: %.0f\n", 
+		       (double)stats.total_written);
+		printf("Total bytes read: %.0f\n\n", 
+		       (double)stats.total_read);
 	}
 	
 	printf("wrote %.0f bytes  read %.0f bytes  %.2f bytes/sec\n",
-	       (double)out,(double)in,(in+out)/(0.5 + (t-starttime)));
+	       (double)stats.total_written,
+	       (double)stats.total_read,
+	       (stats.total_written+stats.total_read)/(0.5 + (t-starttime)));
 	printf("total size is %.0f  speedup is %.2f\n",
-	       (double)tsize,(1.0*tsize)/(in+out));
+	       (double)stats.total_size,
+	       (1.0*stats.total_size)/(stats.total_written+stats.total_read));
+
+	fflush(stdout);
+	fflush(stderr);
 }
 
 
@@ -146,40 +172,42 @@ static char *get_local_name(struct file_list *flist,char *name)
 	STRUCT_STAT st;
 	extern int orig_umask;
 
-  if (do_stat(name,&st) == 0) {
-    if (S_ISDIR(st.st_mode)) {
-      if (chdir(name) != 0) {
-	rprintf(FERROR,"chdir %s : %s (1)\n",name,strerror(errno));
-	exit_cleanup(1);
-      }
-      return NULL;
-    }
-    if (flist->count > 1) {
-      rprintf(FERROR,"ERROR: destination must be a directory when copying more than 1 file\n");
-      exit_cleanup(1);
-    }
-    return name;
-  }
-
-  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(1);
-  } else {
-    rprintf(FINFO,"created directory %s\n",name);
-  }
-
-  if (chdir(name) != 0) {
-    rprintf(FERROR,"chdir %s : %s (2)\n",name,strerror(errno));
-    exit_cleanup(1);
-  }
-
-  return NULL;
+	if (do_stat(name,&st) == 0) {
+		if (S_ISDIR(st.st_mode)) {
+			if (!push_dir(name, 0)) {
+				rprintf(FERROR,"push_dir %s : %s (1)\n",
+					name,strerror(errno));
+				exit_cleanup(1);
+			}
+			return NULL;
+		}
+		if (flist->count > 1) {
+			rprintf(FERROR,"ERROR: destination must be a directory when copying more than 1 file\n");
+			exit_cleanup(1);
+		}
+		return name;
+	}
+
+	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(1);
+	} else {
+		rprintf(FINFO,"created directory %s\n",name);
+	}
+
+	if (!push_dir(name, 0)) {
+		rprintf(FERROR,"push_dir %s : %s (2)\n",
+			name,strerror(errno));
+		exit_cleanup(1);
+	}
+
+	return NULL;
 }
 
 
@@ -196,8 +224,8 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
 	if (verbose > 2)
 		rprintf(FINFO,"server_sender starting pid=%d\n",(int)getpid());
   
-	if (!relative_paths && chdir(dir) != 0) {
-		rprintf(FERROR,"chdir %s: %s (3)\n",dir,strerror(errno));
+	if (!relative_paths && !push_dir(dir, 0)) {
+		rprintf(FERROR,"push_dir %s: %s (3)\n",dir,strerror(errno));
 		exit_cleanup(1);
 	}
 	argc--;
@@ -218,8 +246,13 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
 	}
 	
 	flist = send_file_list(f_out,argc,argv);
+	if (!flist || flist->count == 0) {
+		exit_cleanup(0);
+	}
+
 	send_files(flist,f_out,f_in);
 	report(f_out);
+	io_flush();
 	exit_cleanup(0);
 }
 
@@ -230,29 +263,38 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 	int status=0;
 	int recv_pipe[2];
 	extern int preserve_hard_links;
-	extern int am_daemon;
 
 	if (preserve_hard_links)
 		init_hard_links(flist);
 
 	if (pipe(recv_pipe) < 0) {
 		rprintf(FERROR,"pipe failed in do_recv\n");
-		exit(1);
+		exit_cleanup(1);
 	}
   
+	io_flush();
 
 	if ((pid=do_fork()) == 0) {
 		close(recv_pipe[0]);
+		if (f_in != f_out) close(f_out);
+
 		recv_files(f_in,flist,local_name,recv_pipe[1]);
-		if (am_daemon) report(-1);
-		exit_cleanup(0);
+		report(f_in);
+
+		if (verbose > 3)
+			rprintf(FINFO,"do_recv waiting on %d\n",pid);
+
+		io_flush();
+		_exit(0);
 	}
 
 	close(recv_pipe[1]);
+	io_close_input(f_in);
+	if (f_in != f_out) close(f_in);
 	generate_files(f_out,flist,local_name,recv_pipe[0]);
 
+	io_flush();
 	waitpid(pid, &status, 0);
-
 	return status;
 }
 
@@ -273,8 +315,8 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
 		dir = argv[0];
 		argc--;
 		argv++;
-		if (!am_daemon && chdir(dir) != 0) {
-			rprintf(FERROR,"chdir %s : %s (4)\n",
+		if (!am_daemon && !push_dir(dir, 0)) {
+			rprintf(FERROR,"push_dir %s : %s (4)\n",
 				dir,strerror(errno));
 			exit_cleanup(1);
 		}    
@@ -285,7 +327,7 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
 
 	flist = recv_file_list(f_in);
 	if (!flist || flist->count == 0) {
-		rprintf(FERROR,"nothing to do\n");
+		rprintf(FERROR,"server_recv: nothing to do\n");
 		exit_cleanup(1);
 	}
 	
@@ -342,7 +384,8 @@ int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
 		send_files(flist,f_out,f_in);
 		if (pid != -1) {
 			if (verbose > 3)
-				rprintf(FINFO,"waiting on %d\n",pid);
+				rprintf(FINFO,"client_run waiting on %d\n",pid);
+			io_flush();
 			waitpid(pid, &status, 0);
 		}
 		report(-1);
@@ -353,7 +396,7 @@ int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
 	
 	flist = recv_file_list(f_in);
 	if (!flist || flist->count == 0) {
-		rprintf(FINFO,"nothing to do\n");
+		rprintf(FINFO,"client: nothing to do\n");
 		exit_cleanup(0);
 	}
 	
@@ -361,9 +404,10 @@ int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
 	
 	status2 = do_recv(f_in,f_out,flist,local_name);
 	
-	report(f_in);
-	
 	if (pid != -1) {
+		if (verbose > 3)
+			rprintf(FINFO,"client_run2 waiting on %d\n",pid);
+		io_flush();
 		waitpid(pid, &status, 0);
 	}
 	
@@ -371,13 +415,13 @@ int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
 }
 
 
-int start_client(int argc, char *argv[])
+static int start_client(int argc, char *argv[])
 {
 	char *p;
 	char *shell_machine = NULL;
 	char *shell_path = NULL;
 	char *shell_user = NULL;
-	int pid;
+	int pid, ret;
 	int f_in,f_out;
 	extern int local_server;
 	extern int am_sender;
@@ -458,7 +502,12 @@ int start_client(int argc, char *argv[])
 	setlinebuf(stderr);
 #endif
 
-	return client_run(f_in, f_out, pid, argc, argv);
+	ret = client_run(f_in, f_out, pid, argc, argv);
+
+	fflush(stdout);
+	fflush(stderr);
+
+	return ret;
 }
 
 
@@ -479,9 +528,11 @@ int main(int argc,char *argv[])
 	starttime = time(NULL);
 	am_root = (getuid() == 0);
 
+	memset(&stats, 0, sizeof(stats));
+
 	if (argc < 2) {
 		usage(FERROR);
-		exit(1);
+		exit_cleanup(1);
 	}
 
 	/* we set a 0 umask so that correct file permissions can be
@@ -494,11 +545,6 @@ int main(int argc,char *argv[])
 	argv += optind;
 	optind = 0;
 
-	if (argc < 1) {
-		usage(FERROR);
-		exit(1);
-	}
-
 	signal(SIGCHLD,SIG_IGN);
 	signal(SIGINT,SIGNAL_CAST sig_int);
 	signal(SIGPIPE,SIGNAL_CAST sig_int);
@@ -508,6 +554,11 @@ int main(int argc,char *argv[])
 		return daemon_main();
 	}
 
+	if (argc < 1) {
+		usage(FERROR);
+		exit_cleanup(1);
+	}
+
 	if (dry_run)
 		verbose = MAX(verbose,1);