f7df269 Be able to load options from the manifest — HardenedBSD-pkg

HardenedBSD Package Manager

Be able to load options from the manifest

Baptiste Daroussin committed 14 years ago

commit f7df269a1c652095f3a5997306209e4075402fcb
parent d6dfd00bb11824f13698fdfdcb500af182b95dc7

1 file changed +5 -0

modified libpkg/pkg_manifest.c

@@ -25,6 +25,7 @@

 #define PKG_CATEGORIES -8
 #define PKG_LICENSELOGIC -9
 #define PKG_LICENSES -10
 #define PKG_OPTIONS -11
 static void parse_mapping(struct pkg *, yaml_node_pair_t *, yaml_document_t *, int);
 static void parse_node(struct pkg *, yaml_node_t *, yaml_document_t *, int);

@@ -53,6 +54,7 @@ static struct manifest_key {

 	{ "scripts", PKG_SCRIPTS},
 	{ "message", PKG_MESSAGE},
 	{ "categories", PKG_CATEGORIES},
 	{ "options", PKG_OPTIONS},
 };
 #define manifest_key_len (int)(sizeof(manifest_key)/sizeof(manifest_key[0]))

@@ -136,6 +138,9 @@ parse_mapping(struct pkg *pkg, yaml_node_pair_t *pair, yaml_document_t *document

 						perm);
 			}
 			break;
 		case PKG_OPTIONS:
 			pkg_addoption(pkg, key->data.scalar.value, val->data.scalar.value);
 			break;
 		case PKG_DEPS:
 			subpair = val->data.mapping.pairs.start;
 			while (subpair < val->data.mapping.pairs.top) {