X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/44e9e221f3c36df43cf22a9f2407de12cfbf9a99..71020fc3aafc1cea58188b261b0f9f5b0c29b5f8:/main.c

diff --git a/main.c b/main.c
index 03133cf1..0a0794a7 100644
--- a/main.c
+++ b/main.c
@@ -116,6 +116,9 @@ static void report(int f)
 		show_flist_stats();
 	}
 
+	if (am_generator)
+		return;
+
 	if (am_daemon) {
 		log_exit(0, __FILE__, __LINE__);
 		if (f == -1 || !am_sender) return;
@@ -206,6 +209,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);
@@ -467,6 +472,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 	generate_files(f_out, flist, local_name);
 
 	get_redo_num(); /* Read final MSG_DONE and any prior messages. */
+	report(-1);
 	io_flush(FULL_FLUSH);
 	if (protocol_version >= 24) {
 		/* send a final goodbye message */
@@ -979,7 +985,7 @@ int main(int argc,char *argv[])
 #endif /* def MAINTAINER_MODE */
 
 	starttime = time(NULL);
-	am_root = (getuid() == 0);
+	am_root = (MY_UID() == 0);
 
 	memset(&stats, 0, sizeof(stats));