[Midnightbsd-cvs] src [7500] trunk/usr.sbin/mport/mport.c: switch to using mport_info

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Mar 24 21:08:06 EDT 2016


Revision: 7500
          http://svnweb.midnightbsd.org/src/?rev=7500
Author:   laffer1
Date:     2016-03-24 21:08:06 -0400 (Thu, 24 Mar 2016)
Log Message:
-----------
switch to using mport_info

Modified Paths:
--------------
    trunk/usr.sbin/mport/mport.c

Modified: trunk/usr.sbin/mport/mport.c
===================================================================
--- trunk/usr.sbin/mport/mport.c	2016-03-25 01:04:13 UTC (rev 7499)
+++ trunk/usr.sbin/mport/mport.c	2016-03-25 01:08:06 UTC (rev 7500)
@@ -34,6 +34,7 @@
 #include <sysexits.h>
 #include <unistd.h>
 #include <err.h>
+#include <dispatch/dispatch.h>
 #include <mport.h>
 
 #define MPORT_TOOLS_PATH "/usr/libexec/"
@@ -73,7 +74,7 @@
 		usage();
 
 	dispatch_queue_t mainq = dispatch_get_main_queue();
-        dispatch_group_t grp = dispatch_group_create();
+	dispatch_group_t grp = dispatch_group_create();
 	dispatch_queue_t q = dispatch_queue_create("org.midnightbsd.mport.q", NULL);
 	mport = mport_instance_new();
 
@@ -185,7 +186,7 @@
 	} else if (!strcmp(argv[1], "search")) {
 		dispatch_group_async(grp, q, ^{
 		loadIndex(mport);
-		searchQuery = calloc(argc - 1, sizeof(char*));
+		searchQuery = calloc((size_t)argc - 1, sizeof(char*));
 		for (i = 2; i < argc; i++) {
 			searchQuery[i-2] = strdup(argv[i]);
 		}
@@ -377,62 +378,20 @@
 
 int
 info(mportInstance *mport, const char *packageName) {
-	mportIndexEntry **indexEntry;
-	mportPackageMeta **packs;
-	char *status, *origin;
-	char *os_release;
-	char *cpe;
-	int locked = 0;
-
 	if (packageName == NULL) {
 		warnx("%s", "Specify package name");
 		return (1);
 	}
 
-	indexEntry = lookupIndex(mport, packageName);
-	if (indexEntry == NULL || *indexEntry == NULL) {
-		warnx("%s not found in index.", packageName);
-		return (1);
-	}
-
-	if (mport_pkgmeta_search_master(mport, &packs, "pkg=%Q", packageName) != MPORT_OK) {
+	char *out = mport_info(mport, packageName);
+	if (out == NULL) {
 		warnx("%s", mport_err_string());
 		return (1);
 	}
 
-	if (packs == NULL) {
-		status = strdup("N/A");
-		origin = strdup("");
-		os_release = strdup("");
-		cpe = strdup("");
-	} else {
-		status = (*packs)->version;
-		origin = (*packs)->origin;
-		os_release = (*packs)->os_release;
-		cpe = (*packs)->cpe;
-		locked = (*packs)->locked;
-	}
+	printf("%s", out);
+	free(out);
 
-	printf("%s\nlatest: %s\ninstalled: %s\nlicense: %s\norigin: %s\nos: %s\n\n%s\ncpe: %s\nlocked: %s\n",
-		(*indexEntry)->pkgname,
-		(*indexEntry)->version,
-		status,
-		(*indexEntry)->license,
-		origin,
-		os_release,
-		(*indexEntry)->comment,
-		cpe,
-		locked ? "yes" : "no");
-
-	if (packs == NULL) {
-		free(status);
-		free(origin);
-		free(os_release);
-		free(cpe);
-	} else
-		mport_pkgmeta_vec_free(packs);
-
-	mport_index_entry_free_vec(indexEntry);
 	return (0);
 }
 



More information about the Midnightbsd-cvs mailing list