X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e5fbaa713ac75fb07907934483d7945a7b7ac2cd..530adb762573d9f37be07eb38d0ffc7b5c401e6a:/main.c

diff --git a/main.c b/main.c
index c0db3fc3..5ad1bf20 100644
--- a/main.c
+++ b/main.c
@@ -108,7 +108,6 @@ void wait_process(pid_t pid, int *status)
 static void report(int f)
 {
 	time_t t = time(NULL);
-	int send_stats;
 
 	if (do_stats && verbose > 1) {
 		/* These come out from every process */
@@ -124,9 +123,8 @@ static void report(int f)
 		if (f == -1 || !am_sender) return;
 	}
 
-	send_stats = verbose || protocol_version >= 20;
 	if (am_server) {
-		if (am_sender && send_stats) {
+		if (am_sender) {
 			int64 w;
 			/* store total_written in a temporary
 			 * because write_longint changes it */
@@ -140,7 +138,7 @@ static void report(int f)
 
 	/* this is the client */
 
-	if (!am_sender && send_stats) {
+	if (!am_sender) {
 		int64 r;
 		stats.total_written = read_longint(f);
 		/* store total_read in a temporary, read_longint changes it */
@@ -150,12 +148,6 @@ static void report(int f)
 	}
 
 	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);
@@ -209,6 +201,8 @@ static void show_malloc_stats(void)
 	rprintf(FINFO, "  smblks:    %10d\n", mi.smblks);
 	rprintf(FINFO, "  hblks:     %10d   (chunks from mmap)\n", mi.hblks);
 	rprintf(FINFO, "  hblkhd:    %10d   (bytes from mmap)\n", mi.hblkhd);
+	rprintf(FINFO, "  allmem:    %10d   (bytes from sbrk + mmap)\n",
+	    mi.arena + mi.hblkhd);
 	rprintf(FINFO, "  usmblks:   %10d\n", mi.usmblks);
 	rprintf(FINFO, "  fsmblks:   %10d\n", mi.fsmblks);
 	rprintf(FINFO, "  uordblks:  %10d   (bytes used)\n", mi.uordblks);
@@ -219,12 +213,13 @@ static void show_malloc_stats(void)
 
 
 /* Start the remote shell.   cmd may be NULL to use the default. */
-static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out)
+static pid_t do_cmd(char *cmd, char *machine, char *user, char *path,
+		    int *f_in, int *f_out)
 {
+	int i, argc = 0;
 	char *args[100];
-	int i,argc=0;
 	pid_t ret;
-	char *tok,*dir=NULL;
+	char *tok, *dir = NULL;
 	int dash_l_set = 0;
 
 	if (!read_batch && !local_server) {
@@ -237,9 +232,8 @@ static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int
 		if (!cmd)
 			goto oom;
 
-		for (tok=strtok(cmd," ");tok;tok=strtok(NULL," ")) {
+		for (tok = strtok(cmd, " "); tok; tok = strtok(NULL, " "))
 			args[argc++] = tok;
-		}
 
 		/* check to see if we've already been given '-l user' in
 		 * the remote-shell command */
@@ -283,6 +277,11 @@ static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int
 	if (!daemon_over_rsh && path && *path)
 		args[argc++] = path;
 
+	if (argc >= (int)(sizeof args / sizeof args[0])) {
+		rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n");
+		exit_cleanup(RERR_MALLOC); /* XXX Need better RERR? */
+	}
+
 	args[argc] = NULL;
 
 	if (verbose > 3) {
@@ -489,7 +488,7 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
 {
 	int status;
 	struct file_list *flist;
-	char *local_name=NULL;
+	char *local_name = NULL;
 	char *dir = NULL;
 
 	if (verbose > 2) {