Mon Oct 26 20:18:33 2020 UTC ()

PR 55752: relax an assertion, the first getvfsstat() call may overestimate
the file systems visible to us.


(martin)

diff -r1.50 -r1.51 src/usr.sbin/sysinst/util.c

--- src/usr.sbin/sysinst/util.c 2020/10/25 08:50:32	1.50
+++ src/usr.sbin/sysinst/util.c 2020/10/26 20:18:33	1.51

 @@ -1,14 +1,14 @@
-/*	$NetBSD: util.c,v 1.50 2020/10/25 08:50:32 martin Exp $	*/
+/*	$NetBSD: util.c,v 1.51 2020/10/26 20:18:33 martin Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information 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
 @@ -505,38 +505,38 @@ get_available_cds_helper(void *arg, cons
+	}
 	return true;
+}
 /*
  * Get a list of all available CD media (not drives!), return
  * the number of entries collected.
  */
 static int
 get_available_cds(void)
+{
 	struct get_available_cds_state data;
-	int n, __diagused e;
+	int n, m;
 	memset(&data, 0, sizeof data);
 	data.info = cds;
 	n = getvfsstat(NULL, 0, ST_NOWAIT);
 	if (n > 0) {
 		data.mounted = calloc(n, sizeof(*data.mounted));
-		e = getvfsstat(data.mounted, n*sizeof(*data.mounted),
+		m = getvfsstat(data.mounted, n*sizeof(*data.mounted),
 		    ST_NOWAIT);
-		assert(e == n);
+		assert(m >= 0 && m <= n);
-		data.num_mounted = n;
+		data.num_mounted = m;
+	}
 	enumerate_disks(&data, get_available_cds_helper);
 	free(data.mounted);
 	return data.count;
+}
 static int
 cd_has_sets(void)
+{
 	/* Mount it */