 @@ -1,14 +1,14 @@
-/*	$NetBSD: makefs.h,v 1.38 2022/04/09 10:05:35 riastradh Exp $	*/
+/*	$nEtBSD: makefs.h,v 1.38 2022/04/09 10:05:35 riastradh Exp $	*/
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Luke Mewburn for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -34,27 +34,27 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef	_MAKEFS_H
 #define	_MAKEFS_H
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #else
 #define HAVE_STRUCT_STAT_ST_FLAGS 1
 #define HAVE_STRUCT_STAT_ST_GEN 1
 #define HAVE_STRUCT_STAT_ST_MTIMENSEC 1
-#define HAVE_STRUCT_STATVFS_F_IOSIZE 1
+//#define HAVE_STRUCT_STATVFS_F_IOSIZE 1
 #define HAVE_STRUCT_STAT_BIRTHTIME 1
 #define HAVE_FSTATVFS 1
 #endif
 #include <sys/stat.h>
 #include <err.h>
 /*
  * fsnode -
  *	a component of the tree; contains a filename, a pointer to
  *	fsinode, optional symlink name, and tree pointers
+ *
  * fsinode -

 @@ -1,14 +1,14 @@
-/* $NetBSD: udf.c,v 1.29 2022/04/26 15:18:08 reinoud Exp $ */
+/* $NetBSD: udf.c,v 1.30 2022/05/07 08:54:02 reinoud Exp $ */
 /*
  * Copyright (c) 2006, 2008, 2013, 2021, 2022 Reinoud Zandijk
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -20,27 +20,27 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: udf.c,v 1.29 2022/04/26 15:18:08 reinoud Exp $");
+__RCSID("$NetBSD: udf.c,v 1.30 2022/05/07 08:54:02 reinoud Exp $");
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include <time.h>
 #include <assert.h>
 #include <err.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <math.h>
 #include <sys/types.h>
 #include <sys/param.h>
 @@ -1120,27 +1120,44 @@ udf_enumerate_and_estimate(const char *d
 		nblk += spareable_blockingnr;		/* slack */
+	}
 	nblk += 256;					/* pre-volume space  */
 	nblk += 256;					/* post-volume space */
 	nblk += 1024;					/* safeguard	     */
 	/* try to honour minimum size */
 	n = fsopts->minsize / fsopts->sectorsize;
 	if (nblk < n) {
 		stats->ndatablocks += (n - nblk);
 		nblk += n - nblk;
+	}
 	/* keep proposed size a multiple of blockingnr for image creation */
 	if (S_ISREG(dev_fd_stat.st_mode)) {
 		struct mmc_trackinfo ti;
 		int blockingnr;
 		int error;
 		/* adjust proposed size to be a multiple of the blockingnr */
 		udf_update_discinfo();
 		ti.tracknr = mmc_discinfo.first_track_last_session;
 		error = udf_update_trackinfo(&ti);
 		assert(!error);
 		blockingnr = udf_get_blockingnr(&ti);
 		nblk = UDF_ROUNDUP(nblk, blockingnr);
+	}
 	proposed_size = (off_t) nblk * fsopts->sectorsize;
 	/* sanity size */
 	if (proposed_size < 512*1024)
 		proposed_size = 512*1024;
 	if (fsopts->size) {
 		if (fsopts->size < proposed_size)
 			errx(1, "makefs_udf: won't fit on disc!");
 	} else {
 		fsopts->size = proposed_size;
+	}
 	fsopts->inodes = stats->nfiles + stats->ndirs;
+}