2601976 Finish adapting pkg_get — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Finish adapting pkg_get

Baptiste Daroussin committed 11 years ago

commit 26019769ac88de5c5244c41bdebdd82c66e25261
parent 38e88bf

1 file changed +16 -1

modified libpkg/pkg.c

@@ -279,7 +279,7 @@ pkg_vget(const struct pkg * restrict pkg, va_list ap)

 	while ((attr = va_arg(ap, int)) > 0) {
 		if (attr >= PKG_NUM_FIELDS || attr <= 0) {
 			pkg_emit_error("Bad argument on pkg_get");
 			pkg_emit_error("Bad argument on pkg_get %d", attr);
 			return (EPKG_FATAL);
 		}

@@ -365,6 +365,21 @@ pkg_vget(const struct pkg * restrict pkg, va_list ap)

 		case PKG_TIME:
 			*va_arg(ap, int64_t *) = pkg->timestamp;
 			break;
 		case PKG_ANNOTATIONS:
 			*va_arg(ap, const pkg_object **) = ucl_object_find_key(pkg->fields, "annotations");
 			break;
 		case PKG_CATEGORIES:
 			*va_arg(ap, const pkg_object **) = ucl_object_find_key(pkg->fields, "categories");
 			break;
 		case PKG_LICENSES:
 			*va_arg(ap, const pkg_object **) = ucl_object_find_key(pkg->fields, "licenses");
 			break;
 		case PKG_UNIQUEID:
 			*va_arg(ap, const char **) = pkg->uid;
 			break;
 		case PKG_OLD_DIGEST:
 			*va_arg(ap, const char **) = pkg->old_digest;
 			break;
 		}
 	}