24b1e87 Better search output — HardenedBSD-pkg

HardenedBSD Package Manager

Better search output

Baptiste Daroussin committed 14 years ago

commit 24b1e877fd456420a9fe197c9b5565f2cec786b8
parent 46257b0f597e7823e7d49088b69c538782201dab

2 files changed +13 -2

modified libpkg/pkgdb.c

@@ -384,6 +384,11 @@ pkgdb_it_next(struct pkgdb_it *it, struct pkg **pkg_p, int flags)

 		pkg_set(pkg, PKG_PREFIX, sqlite3_column_text(it->stmt, 11));
 		pkg_setflatsize(pkg, sqlite3_column_int64(it->stmt, 12));
 		if (it->type == PKG_REMOTE) {
 			pkg->type = PKG_REMOTE;
 			pkg_setnewflatsize(pkg, sqlite3_column_int64(it->stmt, 11));
 			pkg_setnewpkgsize(pkg, sqlite3_column_int64(it->stmt, 12));
 		}
 		if (it->type == PKG_UPGRADE) {
 			pkg->type = PKG_UPGRADE;

@@ -1424,8 +1429,8 @@ pkgdb_rquery(struct pkgdb *db, const char *pattern, match_t match, unsigned int

 	}
 	sbuf_cat(sql, "SELECT p.rowid, p.origin, p.name, p.version, p.comment, "
 			"p.desc, p.arch, p.osversion, p.maintainer, p.www, p.pkgsize, "
 			"p.flatsize, p.cksum, p.path FROM remote.packages AS p WHERE ");
 			"p.desc, p.arch, p.arch, p.osversion, p.maintainer, p.www, "
 			"p.flatsize, p.pkgsize, p.cksum, p.path FROM remote.packages AS p WHERE ");
 	switch (match) {
 		case MATCH_ALL:

modified pkg/search.c

@@ -76,7 +76,13 @@ exec_search(int argc, char **argv)

 		printf("Name: %s\n", pkg_get(pkg, PKG_NAME));
 		printf("Version: %s\n", pkg_get(pkg, PKG_VERSION));
 		printf("Origin: %s\n", pkg_get(pkg, PKG_ORIGIN));
 		printf("Maintainer: %s\n", pkg_get(pkg, PKG_MAINTAINER));
 		printf("WWW: %s\n", pkg_get(pkg, PKG_WWW));
 		printf("Comment: %s\n", pkg_get(pkg, PKG_COMMENT));
 		humanize_number(size, sizeof(size), pkg_new_flatsize(pkg), "B", HN_AUTOSCALE, 0);
 		printf("Flat size: %s\n", size);
 		humanize_number(size, sizeof(size), pkg_new_pkgsize(pkg), "B", HN_AUTOSCALE, 0);
 		printf("Pkg size: %s\n", size);
 		printf("\n");
 	}