D43513.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D43513.diff
View Options

	diff --git a/usr.sbin/makefs/makefs.8 b/usr.sbin/makefs/makefs.8
	--- a/usr.sbin/makefs/makefs.8
	+++ b/usr.sbin/makefs/makefs.8
	@@ -33,7 +33,7 @@
	.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
	.\" POSSIBILITY OF SUCH DAMAGE.
	.\"
	-.Dd January 2, 2024
	+.Dd January 19, 2024

	.Dt MAKEFS 8
	.Os
	@@ -110,6 +110,8 @@
	indicates a percentage of the calculated image size.
	.It Fl D
	Treat duplicate paths in an mtree manifest as warnings not error.
	+If this flag is specified more than once, warnings about duplicate paths
	+are not printed at all.
	.It Fl d Ar debug-mask
	Enable various levels of debugging, depending upon which bits are
	set in
	diff --git a/usr.sbin/makefs/makefs.c b/usr.sbin/makefs/makefs.c
	--- a/usr.sbin/makefs/makefs.c
	+++ b/usr.sbin/makefs/makefs.c
	@@ -164,7 +164,7 @@
	break;

	case 'D':
	- dupsok = 1;
	+ dupsok++;
	break;

	case 'd':
	diff --git a/usr.sbin/makefs/mtree.c b/usr.sbin/makefs/mtree.c
	--- a/usr.sbin/makefs/mtree.c
	+++ b/usr.sbin/makefs/mtree.c
	@@ -894,11 +894,11 @@

	if (strcmp(name, node->name) == 0) {
	if (def == true) {
	- if (!dupsok)
	+ if (dupsok == 0)
	mtree_error(
	"duplicate definition of %s",
	name);
	- else
	+ else if (dupsok == 1)
	mtree_warning(
	"duplicate definition of %s",
	name);