===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rsync/session.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/rsync/session.c	2019/03/31 09:26:05	1.6
--- src/usr.bin/rsync/session.c	2019/05/08 20:00:25	1.7
***************
*** 1,4 ****
! /*	$Id: session.c,v 1.6 2019/03/31 09:26:05 deraadt Exp $ */
  /*
   * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
   *
--- 1,4 ----
! /*	$Id: session.c,v 1.7 2019/05/08 20:00:25 benno Exp $ */
  /*
   * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
   *
***************
*** 36,42 ****
  	const char	*tru = "B", *twu = "B", *tsu = "B";
  	int		 trsz = 0, twsz = 0, tssz = 0;
  
! 	assert(sess->opts->verbose);
  	if (sess->opts->server)
  		return;
  
--- 36,42 ----
  	const char	*tru = "B", *twu = "B", *tsu = "B";
  	int		 trsz = 0, twsz = 0, tssz = 0;
  
! 	assert(verbose);
  	if (sess->opts->server)
  		return;
  
***************
*** 85,91 ****
  	} else
  		ts = tsize;
  
! 	LOG1(sess, "Transfer complete: "
  	    "%.*lf %s sent, %.*lf %s read, %.*lf %s file size",
  	    trsz, tr, tru,
  	    twsz, tw, twu,
--- 85,91 ----
  	} else
  		ts = tsize;
  
! 	LOG1("Transfer complete: "
  	    "%.*lf %s sent, %.*lf %s read, %.*lf %s file size",
  	    trsz, tr, tru,
  	    twsz, tw, twu,
***************
*** 103,109 ****
  {
  	uint64_t tw, tr, ts;
  
! 	if (sess->opts->verbose == 0)
  		return 1;
  
  	tw = sess->total_write;
--- 103,109 ----
  {
  	uint64_t tw, tr, ts;
  
! 	if (verbose == 0)
  		return 1;
  
  	tw = sess->total_write;
***************
*** 112,124 ****
  
  	if (sess->opts->server) {
  		if (!io_write_ulong(sess, fd, tr)) {
! 			ERRX1(sess, "io_write_ulong");
  			return 0;
  		} else if (!io_write_ulong(sess, fd, tw)) {
! 			ERRX1(sess, "io_write_ulong");
  			return 0;
  		} else if (!io_write_ulong(sess, fd, ts)) {
! 			ERRX1(sess, "io_write_ulong");
  			return 0;
  		}
  	}
--- 112,124 ----
  
  	if (sess->opts->server) {
  		if (!io_write_ulong(sess, fd, tr)) {
! 			ERRX1("io_write_ulong");
  			return 0;
  		} else if (!io_write_ulong(sess, fd, tw)) {
! 			ERRX1("io_write_ulong");
  			return 0;
  		} else if (!io_write_ulong(sess, fd, ts)) {
! 			ERRX1("io_write_ulong");
  			return 0;
  		}
  	}
***************
*** 139,155 ****
  {
  	uint64_t tr, tw, ts;
  
! 	if (sess->opts->server || sess->opts->verbose == 0)
  		return 1;
  
  	if (!io_read_ulong(sess, fd, &tw)) {
! 		ERRX1(sess, "io_read_ulong");
  		return 0;
  	} else if (!io_read_ulong(sess, fd, &tr)) {
! 		ERRX1(sess, "io_read_ulong");
  		return 0;
  	} else if (!io_read_ulong(sess, fd, &ts)) {
! 		ERRX1(sess, "io_read_ulong");
  		return 0;
  	}
  
--- 139,155 ----
  {
  	uint64_t tr, tw, ts;
  
! 	if (sess->opts->server || verbose == 0)
  		return 1;
  
  	if (!io_read_ulong(sess, fd, &tw)) {
! 		ERRX1("io_read_ulong");
  		return 0;
  	} else if (!io_read_ulong(sess, fd, &tr)) {
! 		ERRX1("io_read_ulong");
  		return 0;
  	} else if (!io_read_ulong(sess, fd, &ts)) {
! 		ERRX1("io_read_ulong");
  		return 0;
  	}