From 35e996c9207cf8bf5993d3a18eadfa5270c1c560 Mon Sep 17 00:00:00 2001 From: Tomohiro Kusumi Date: Fri, 1 Mar 2024 00:26:47 -0800 Subject: [PATCH] usr.sbin/makefs/msdos: Fix broken extra-directory case Same fix as d541bdf518b24b3f6deb5a62fab0ca6492be4470 for HAMMER2. --- usr.sbin/makefs/msdos.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/makefs/msdos.c b/usr.sbin/makefs/msdos.c index 3f082a2228..c75458d7c4 100644 --- a/usr.sbin/makefs/msdos.c +++ b/usr.sbin/makefs/msdos.c @@ -224,8 +224,8 @@ msdos_populate_dir(const char *path, struct denode *dir, fsnode *root, assert(fsopts != NULL); for (cur = root->next; cur != NULL; cur = cur->next) { - if ((size_t)snprintf(pbuf, sizeof(pbuf), "%s/%s", path, - cur->name) >= sizeof(pbuf)) { + if ((size_t)snprintf(pbuf, sizeof(pbuf), "%s/%s/%s", + cur->root, cur->path, cur->name) >= sizeof(pbuf)) { warnx("path %s too long", pbuf); return -1; } -- 2.11.4.GIT