X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7a6421fa764dd0f609e2a5024ec8b3bc577575a1..18baf523dc90d0dd2131ee89d688a62844b6e01a:/main.c

diff --git a/main.c b/main.c
index e9a00397..0408f61e 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;
 
@@ -48,8 +56,8 @@ static void report(int f)
 		out = write_total();
 		tsize = total_size;
 	} else {
-		in = read_longint(f);
 		out = read_longint(f);
+		in = read_longint(f);
 		tsize = read_longint(f);
 	}
 	
@@ -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,26 +211,12 @@ 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--;
 		argv[0] = ".";
 	}
 	
-	rprintf(FINFO,"sending file list\n");
-	
 	flist = send_file_list(f_out,argc,argv);
 	send_files(flist,f_out,f_in);
 	report(f_out);
@@ -274,18 +267,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--;
@@ -315,6 +296,7 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
 	}
 
 	status = do_recv(f_in,f_out,flist,local_name);
+	report(-1);
 	exit_cleanup(status);
 }
 
@@ -496,6 +478,11 @@ int main(int argc,char *argv[])
 	starttime = time(NULL);
 	am_root = (getuid() == 0);
 
+	if (argc < 2) {
+		usage(FERROR);
+		exit(1);
+	}
+
 	/* we set a 0 umask so that correct file permissions can be
 	   carried across */
 	orig_umask = (int)umask(0);