Re: pkg/56733: mtree bug processing filenames containing asterisks

[John Goerzen <jgoerzen%complete.org@localhost>]

FWIW, I just realized that there are two different mtree trees in
NetBSD; one in pkgsrc, and one in src/usr.sbin.

I have been using the one from pkgsrc, and was asked to submit here.
The trees are related but divergent.

This patch fixes the issue for me with the pkgsrc tree:

--- verify.c.orig       2018-08-22 15:48:38.000000000 -0500
+++ verify.c    2022-03-01 09:45:04.854574448 -0600
@@ -142,9 +142,7 @@
                if (specdepth != p->fts_level)
                        goto extra;
                for (ep = level; ep; ep = ep->next)
-                       if ((ep->flags & F_MAGIC &&
-                           !fnmatch(ep->name, p->fts_name, FNM_PATHNAME)) ||
-                           !strcmp(ep->name, p->fts_name)) {
+                       if (!strcmp(ep->name, p->fts_name)) {
                                ep->flags |= F_VISIT;
                                if (compare(ep, p))
                                        rval = MISMATCHEXIT;

- John