X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/df5e03da7b1c81d014388b7aa0ac764b97e9dee2..08ac228fbd0be74bfb65d1d3f98f7901eda129ba:/main.c

diff --git a/main.c b/main.c
index b4c514fd..d0b25417 100644
--- a/main.c
+++ b/main.c
@@ -32,6 +32,14 @@ static void report(int f)
 	time_t t = time(NULL);
 	extern int am_server;
 	extern int am_sender;
+	extern int am_daemon;
+
+	if (am_daemon) {
+		rprintf(FINFO, "wrote %.0f bytes  read %.0f bytes  total size %.0f\n",
+			(double)write_total(),(double)read_total(),
+			(double)total_size);
+		if (f == -1 || !am_sender) return;
+	}
 
 	if (!verbose) return;
 
@@ -183,7 +191,6 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
 	struct file_list *flist;
 	char *dir = argv[0];
 	extern int relative_paths;
-	extern int am_daemon;
 	extern int recurse;
 
 	if (verbose > 2)
@@ -204,18 +211,6 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
 			argv[i] += l+1;
 	}
 
-	if (am_daemon) {
-		extern int module_id;
-		char *name = lp_name(module_id);
-		int l = strlen(name);
-		for (i=0;i<argc;i++) {
-			if (strncmp(argv[i], name, l) == 0) {
-				argv[i] += l;
-				if (!*argv[i]) argv[i] = ".";
-			}
-		}
-	}
-	
 	if (argc == 0 && recurse) {
 		argc=1;
 		argv--;
@@ -231,32 +226,34 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
 
 static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 {
-  int pid;
-  int status=0;
-  int recv_pipe[2];
-  extern int preserve_hard_links;
+	int pid;
+	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 (preserve_hard_links)
+		init_hard_links(flist);
 
-  if (pipe(recv_pipe) < 0) {
-    rprintf(FERROR,"pipe failed in do_recv\n");
-    exit(1);
-  }
+	if (pipe(recv_pipe) < 0) {
+		rprintf(FERROR,"pipe failed in do_recv\n");
+		exit(1);
+	}
   
 
-  if ((pid=do_fork()) == 0) {
-    recv_files(f_in,flist,local_name,recv_pipe[1]);
-    if (verbose > 2)
-      rprintf(FINFO,"receiver read %ld\n",(long)read_total());
-    exit_cleanup(0);
-  }
+	if ((pid=do_fork()) == 0) {
+		close(recv_pipe[0]);
+		recv_files(f_in,flist,local_name,recv_pipe[1]);
+		if (am_daemon) report(-1);
+		exit_cleanup(0);
+	}
 
-  generate_files(f_out,flist,local_name,recv_pipe[0]);
+	close(recv_pipe[1]);
+	generate_files(f_out,flist,local_name,recv_pipe[0]);
 
-  waitpid(pid, &status, 0);
+	waitpid(pid, &status, 0);
 
-  return status;
+	return status;
 }
 
 
@@ -272,18 +269,6 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
 	if (verbose > 2)
 		rprintf(FINFO,"server_recv(%d) starting pid=%d\n",argc,(int)getpid());
 	
-	if (am_daemon) {
-		extern int module_id;
-		char *name = lp_name(module_id);
-		int i, l = strlen(name);
-		for (i=0;i<argc;i++) {
-			if (strncmp(argv[i], name, l) == 0) {
-				argv[i] += l;
-				if (!*argv[i]) argv[i] = ".";
-			}
-		}
-	}
-
 	if (argc > 0) {
 		dir = argv[0];
 		argc--;
@@ -518,6 +503,11 @@ int main(int argc,char *argv[])
 		return daemon_main();
 	}
 
+	if (argc < 1) {
+		usage(FERROR);
+		exit(1);
+	}
+
 	if (dry_run)
 		verbose = MAX(verbose,1);