29c7217 Be sure mtree begins by #mtree for libarchive to be happy with it — HardenedBSD-pkg

HardenedBSD Package Manager

Be sure mtree begins by #mtree for libarchive to be happy with it

Baptiste Daroussin committed 15 years ago

commit 29c7217a0bc78790232e8f8ba33245b964cb7c66
parent 9704ce70b71091b447def83e4a88d81e4941d04c

1 file changed +10 -1

modified libpkg/pkg.c

@@ -90,7 +90,16 @@ pkg_set(struct pkg *pkg, pkg_attr attr, const char *value)

 		case PKG_WWW:
 			return (sbuf_set(&pkg->www, value));
 		case PKG_PREFIX:
 			return (sbuf_set(&pkg->prefix, value));
 			/* ensure that mtree begins by #mtree so libarchive
 			 * could handle it */
 			if (STARTS_WITH(value, "#mtree")) {
 				return (sbuf_set(&pkg->prefix, value));
 			} else {
 				sbuf_set(&pkg->prefix, "#mtree\n");
 				sbuf_cat(pkg->prefix, value);
 				return (EPKG_OK);
 			}
 	}
 	return (EPKG_FATAL);