===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rsync/uploader.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -c -r1.32 -r1.33
*** src/usr.bin/rsync/uploader.c	2021/10/29 08:00:59	1.32
--- src/usr.bin/rsync/uploader.c	2021/11/03 14:42:12	1.33
***************
*** 1,4 ****
! /*	$OpenBSD: uploader.c,v 1.32 2021/10/29 08:00:59 claudio Exp $ */
  /*
   * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2019 Florian Obser <florian@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: uploader.c,v 1.33 2021/11/03 14:42:12 deraadt Exp $ */
  /*
   * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2019 Florian Obser <florian@openbsd.org>
***************
*** 653,659 ****
   */
  static int
  check_file(int rootfd, const struct flist *f, struct stat *st)
! { 
  	if (fstatat(rootfd, f->path, st, AT_SYMLINK_NOFOLLOW) == -1) {
  		if (errno == ENOENT)
  			return 3;
--- 653,659 ----
   */
  static int
  check_file(int rootfd, const struct flist *f, struct stat *st)
! {
  	if (fstatat(rootfd, f->path, st, AT_SYMLINK_NOFOLLOW) == -1) {
  		if (errno == ENOENT)
  			return 3;
***************
*** 1035,1048 ****
  	/* Make sure the block metadata buffer is big enough. */
  
  	u->bufsz =
! 	     sizeof(int32_t) + /* identifier */
! 	     sizeof(int32_t) + /* block count */
! 	     sizeof(int32_t) + /* block length */
! 	     sizeof(int32_t) + /* checksum length */
! 	     sizeof(int32_t) + /* block remainder */
! 	     blk.blksz *
! 	     (sizeof(int32_t) + /* short checksum */
! 	      blk.csum); /* long checksum */
  
  	if (u->bufsz > u->bufmax) {
  		if ((bufp = realloc(u->buf, u->bufsz)) == NULL) {
--- 1035,1048 ----
  	/* Make sure the block metadata buffer is big enough. */
  
  	u->bufsz =
! 	    sizeof(int32_t) + /* identifier */
! 	    sizeof(int32_t) + /* block count */
! 	    sizeof(int32_t) + /* block length */
! 	    sizeof(int32_t) + /* checksum length */
! 	    sizeof(int32_t) + /* block remainder */
! 	    blk.blksz *
! 	    (sizeof(int32_t) + /* short checksum */
! 	    blk.csum); /* long checksum */
  
  	if (u->bufsz > u->bufmax) {
  		if ((bufp = realloc(u->buf, u->bufsz)) == NULL) {