===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rsync/flist.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/rsync/flist.c	2019/02/12 19:13:03	1.9
--- src/usr.bin/rsync/flist.c	2019/02/12 19:19:13	1.10
***************
*** 1,4 ****
! /*	$Id: flist.c,v 1.9 2019/02/12 19:13:03 benno Exp $ */
  /*
   * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
   *
--- 1,4 ----
! /*	$Id: flist.c,v 1.10 2019/02/12 19:19:13 benno Exp $ */
  /*
   * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
   *
***************
*** 733,739 ****
  		if (!flist_append(sess, f, &st, root)) {
  			ERRX1(sess, "flist_append");
  			return 0;
! 		} else if (unveil(root, "r") == -1) {
  			ERR(sess, "%s: unveil", root);
  			return 0;
  		}
--- 733,740 ----
  		if (!flist_append(sess, f, &st, root)) {
  			ERRX1(sess, "flist_append");
  			return 0;
! 		}
! 		if (unveil(root, "r") == -1) {
  			ERR(sess, "%s: unveil", root);
  			return 0;
  		}
***************
*** 752,758 ****
  		if (!flist_append(sess, f, &st, root)) {
  			ERRX1(sess, "flist_append");
  			return 0;
! 		} else if (unveil(root, "r") == -1) {
  			ERR(sess, "%s: unveil", root);
  			return 0;
  		}
--- 753,760 ----
  		if (!flist_append(sess, f, &st, root)) {
  			ERRX1(sess, "flist_append");
  			return 0;
! 		}
! 		if (unveil(root, "r") == -1) {
  			ERR(sess, "%s: unveil", root);
  			return 0;
  		}
***************
*** 855,861 ****
  	if (errno) {
  		ERR(sess, "fts_read");
  		goto out;
! 	} else if (unveil(root, "r") == -1) {
  		ERR(sess, "%s: unveil", root);
  		goto out;
  	}
--- 857,864 ----
  	if (errno) {
  		ERR(sess, "fts_read");
  		goto out;
! 	}
! 	if (unveil(root, "r") == -1) {
  		ERR(sess, "%s: unveil", root);
  		goto out;
  	}
***************
*** 955,961 ****
  		if (unveil(argv[i], "r") == -1) {
  			ERR(sess, "%s: unveil", argv[i]);
  			goto out;
! 		} else if (!flist_append(sess, f, &st, argv[i])) {
  			ERRX1(sess, "flist_append");
  			goto out;
  		}
--- 958,965 ----
  		if (unveil(argv[i], "r") == -1) {
  			ERR(sess, "%s: unveil", argv[i]);
  			goto out;
! 		}
! 		if (!flist_append(sess, f, &st, argv[i])) {
  			ERRX1(sess, "flist_append");
  			goto out;
  		}
***************
*** 996,1002 ****
  	if (unveil(NULL, NULL) == -1) {
  		ERR(sess, "unveil");
  		return 0;
! 	} else if (!rc)
  		return 0;
  
  	qsort(*flp, *sz, sizeof(struct flist), flist_cmp);
--- 1000,1007 ----
  	if (unveil(NULL, NULL) == -1) {
  		ERR(sess, "unveil");
  		return 0;
! 	}
! 	if (!rc)
  		return 0;
  
  	qsort(*flp, *sz, sizeof(struct flist), flist_cmp);