===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rsync/blocks.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -c -r1.15 -r1.16
*** src/usr.bin/rsync/blocks.c	2019/05/08 20:00:25	1.15
--- src/usr.bin/rsync/blocks.c	2019/05/08 21:30:11	1.16
***************
*** 1,4 ****
! /*	$Id: blocks.c,v 1.15 2019/05/08 20:00:25 benno Exp $ */
  /*
   * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
   *
--- 1,4 ----
! /*	$Id: blocks.c,v 1.16 2019/05/08 21:30:11 benno Exp $ */
  /*
   * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
   *
***************
*** 206,213 ****
   * Symmetrises blk_send_ack().
   */
  void
! blk_recv_ack(struct sess *sess, char buf[20],
! 	const struct blkset *blocks, int32_t idx)
  {
  	size_t	 pos = 0, sz;
  
--- 206,212 ----
   * Symmetrises blk_send_ack().
   */
  void
! blk_recv_ack(char buf[20], const struct blkset *blocks, int32_t idx)
  {
  	size_t	 pos = 0, sz;
  
***************
*** 218,228 ****
  	     sizeof(int32_t); /* block remainder */
  	assert(sz == 20);
  
! 	io_buffer_int(sess, buf, &pos, sz, idx);
! 	io_buffer_int(sess, buf, &pos, sz, blocks->blksz);
! 	io_buffer_int(sess, buf, &pos, sz, blocks->len);
! 	io_buffer_int(sess, buf, &pos, sz, blocks->csum);
! 	io_buffer_int(sess, buf, &pos, sz, blocks->rem);
  	assert(pos == sz);
  }
  
--- 217,227 ----
  	     sizeof(int32_t); /* block remainder */
  	assert(sz == 20);
  
! 	io_buffer_int(buf, &pos, sz, idx);
! 	io_buffer_int(buf, &pos, sz, blocks->blksz);
! 	io_buffer_int(buf, &pos, sz, blocks->len);
! 	io_buffer_int(buf, &pos, sz, blocks->csum);
! 	io_buffer_int(buf, &pos, sz, blocks->rem);
  	assert(pos == sz);
  }
  
***************
*** 348,360 ****
  		return 0;
  	}
  
! 	if (!io_unbuffer_size(sess, buf, &pos, sz, &p->blksz))
  		ERRX1("io_unbuffer_size");
! 	else if (!io_unbuffer_size(sess, buf, &pos, sz, &p->len))
  		ERRX1("io_unbuffer_size");
! 	else if (!io_unbuffer_size(sess, buf, &pos, sz, &p->csum))
  		ERRX1("io_unbuffer_size");
! 	else if (!io_unbuffer_size(sess, buf, &pos, sz, &p->rem))
  		ERRX1("io_unbuffer_size");
  	else if (p->len && p->rem >= p->len)
  		ERRX1("non-zero length is less than remainder");
--- 347,359 ----
  		return 0;
  	}
  
! 	if (!io_unbuffer_size(buf, &pos, sz, &p->blksz))
  		ERRX1("io_unbuffer_size");
! 	else if (!io_unbuffer_size(buf, &pos, sz, &p->len))
  		ERRX1("io_unbuffer_size");
! 	else if (!io_unbuffer_size(buf, &pos, sz, &p->csum))
  		ERRX1("io_unbuffer_size");
! 	else if (!io_unbuffer_size(buf, &pos, sz, &p->rem))
  		ERRX1("io_unbuffer_size");
  	else if (p->len && p->rem >= p->len)
  		ERRX1("non-zero length is less than remainder");
***************
*** 394,410 ****
  		return 0;
  	}
  
! 	io_buffer_int(sess, buf, &pos, sz, idx);
! 	io_buffer_int(sess, buf, &pos, sz, p->blksz);
! 	io_buffer_int(sess, buf, &pos, sz, p->len);
! 	io_buffer_int(sess, buf, &pos, sz, p->csum);
! 	io_buffer_int(sess, buf, &pos, sz, p->rem);
  
  	for (i = 0; i < p->blksz; i++) {
! 		io_buffer_int(sess, buf, &pos,
  			sz, p->blks[i].chksum_short);
! 		io_buffer_buf(sess, buf, &pos, sz,
! 			p->blks[i].chksum_long, p->csum);
  	}
  
  	assert(pos == sz);
--- 393,408 ----
  		return 0;
  	}
  
! 	io_buffer_int(buf, &pos, sz, idx);
! 	io_buffer_int(buf, &pos, sz, p->blksz);
! 	io_buffer_int(buf, &pos, sz, p->len);
! 	io_buffer_int(buf, &pos, sz, p->csum);
! 	io_buffer_int(buf, &pos, sz, p->rem);
  
  	for (i = 0; i < p->blksz; i++) {
! 		io_buffer_int(buf, &pos,
  			sz, p->blks[i].chksum_short);
! 		io_buffer_buf(buf, &pos, sz, p->blks[i].chksum_long, p->csum);
  	}
  
  	assert(pos == sz);