Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 6088e07
rquery -I: Add all expected output and simplify by using pkg_printf(3)
Bryan Drewery committed 11 years ago
commit 6088e078257b1de47e48186946fbdeab03299471
parent 92e2ffe
1 file changed +17 -9
modified src/rquery.c
@@ -82,15 +82,23 @@ usage_rquery(void)
static void

print_index(struct pkg *pkg, const char *portsdir)

{
- 
	const pkg_object *obj, *list;
- 
	pkg_iter iter = NULL;
- 
	pkg_printf("%n-%v|%S/%o|%p|%c|%S/%o/pkg-descr|%m|",
- 
	    pkg, pkg, portsdir, pkg, pkg, pkg, portsdir, pkg, pkg);
- 
	pkg_get(pkg, PKG_CATEGORIES, &list);
- 
	while ((obj = pkg_object_iterate(list, &iter)))
- 
		pkg_printf("%Cn ", obj);
- 
	printf("\n");
+ 
	pkg_printf(
+ 
	    "%n-%v|"			/* PKGNAME */
+ 
	    "%S/%o|"			/* PORTDIR */
+ 
	    "%p|"			/* PREFIX */
+ 
	    "%c|"			/* COMMENT */
+ 
	    "%S/%o/pkg-descr|"		/* _DESCR */
+ 
	    "%m|"			/* MAINTAINER */
+ 
	    "%C%{%Cn%| %}|"		/* CATEGORIES */
+ 
	    "|"				/* BUILD_DEPENDS */
+ 
	    "%d%{%dn-%dv%| %}|"		/* RUN_DEPENDS */
+ 
	    "%w|"			/* WWW */
+ 
	    "|"				/* EXTRACT_DEPENDS */
+ 
	    "|"				/* PATCH_DEPENDS */
+ 
	    "\n",			/* FETCH_DEPENDS */
+ 
	    pkg, pkg, portsdir, pkg, pkg, pkg, portsdir, pkg, pkg, pkg, pkg,
+ 
	    pkg);

}



int
@@ -218,7 +226,7 @@ exec_rquery(int argc, char **argv)
		return (EX_IOERR);



	if (index_output)
- 
		query_flags = PKG_LOAD_BASIC|PKG_LOAD_CATEGORIES;
+ 
		query_flags = PKG_LOAD_BASIC|PKG_LOAD_CATEGORIES|PKG_LOAD_DEPS;



	if (match == MATCH_ALL || match == MATCH_CONDITION) {

		const char *condition_sql = NULL;