X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-search.c;h=a98aa002cd3abe8b570bb6454d4c5de3d2a419ac;hb=ff5642a271350490e758b206b1c57afb42f93d07;hp=290c0834c63dc76212beaeea680faf799d02f5ad;hpb=c42bb61b39cceab59c17d352f2593f3a5239a27d;p=zpackage

diff --git a/zpm-search.c b/zpm-search.c
index 290c083..a98aa00 100644
--- a/zpm-search.c
+++ b/zpm-search.c
@@ -17,6 +17,7 @@ struct pkgloc {
 	char *id;
 	char *file;
 	int info;
+	int installed;
 };
 
 struct search_ctl {
@@ -24,7 +25,11 @@ struct search_ctl {
 	struct zpm *zpmdb;
 	glob_t repos;
 	int matchallpkgfile;
+	int matchinstalled;
+	int suppressinstalled;
+	int onlylocalinstalled;
 	int verbose;
+	int dbrepos;
 };
 
 char *pathcat(char *dir, char *path) {
@@ -134,7 +139,6 @@ int find_globs(struct search_ctl *opt) {
 			default:
 				break;
 		}
-		globopts = GLOB_APPEND;
 		free(globstr);
 	}
 
@@ -191,7 +195,7 @@ int find_lib(char *soname, struct search_ctl *opt, struct pkgloc *pkg) {
 struct pkgloc *find_package(char *pkgstr, struct search_ctl *opt) {
 	char *latest = 0;
 	char *installed = 0, *found = 0;
-	char *pkgfile;
+	char *pkgfile = 0;
 	struct pkgloc *pkg = 0;
 	int rv;
 	unsigned int i;
@@ -200,15 +204,24 @@ struct pkgloc *find_package(char *pkgstr, struct search_ctl *opt) {
 		installed = zpm_findpkg(opt->zpmdb, pkgstr, "status = 'installed'");
 		if (installed) {
 			latest = installed;
+			pkgfile = opt->zpmdb->path;
 		}
-		found = zpm_findpkg(opt->zpmdb, pkgstr, NULL);
-		if (found) {
-			rv = zpm_vercmp(found, latest);
-			if (rv == 1) {
-				latest = found;
-				pkgfile = opt->zpmdb->path;
+		if (!opt->onlylocalinstalled) {
+			found = zpm_findpkg(opt->zpmdb, pkgstr, NULL);
+			if (found) {
+				rv = zpm_vercmp(found, latest);
+				if (rv == 1) {
+					latest = found;
+					pkgfile = opt->zpmdb->path;
+				}
 			}
 		}
+
+#if 0
+		if (opt->dbrepos) {
+			zpm_foreach_repo(opt->zpmdb, search_repo, pkg)
+		}
+#endif
 	}
 
 	for (i = 0; i < opt->repos.gl_pathc; i++) {
@@ -232,6 +245,10 @@ struct pkgloc *find_package(char *pkgstr, struct search_ctl *opt) {
 		pkg = malloc(sizeof *pkg);
 		pkg->id = strdup(latest);
 		pkg->file = pkgfile;
+		pkg->installed = 0;
+		if (installed) {
+		       pkg->installed = !strcmp(latest, installed);
+		}
 	}
 
 	return pkg;
@@ -345,12 +362,10 @@ void checklibs(struct search_ctl *opts,
 				}
 				/* shouldn't be in there already */
 				jsw_hinsert(forlibs, pkginfo.id, pkginfo.file);
-			} 
-			/* otherwise found == 2, so just continue */
-			if (found) {
 				free(pkginfo.file);
 				free(pkginfo.id);
-			}
+			} 
+			/* otherwise found == 2, so just continue */
 		}
 	}
 	free(pkgid);
@@ -393,12 +408,15 @@ int main(int ac, char *av[]) {
 	struct search_ctl opt = { 0 };
 	struct zpm localdb;
 
+	opt.dbrepos = 1;
+
 	opt.localdb = getenv("ZPMDB");
 	if (!opt.localdb) opt.localdb = "/var/lib/zpm/local.db";
 	opt.pkgdir = getenv("ZPM_PACKAGE_DIR");
 	if (!opt.pkgdir) opt.pkgdir = "/var/lib/zpm/packages";
 	opt.repodir = getenv("ZPM_REPO_DIR");
-	if (!opt.repodir) opt.repodir = "/var/lib/zpm/repo/";
+	if (!opt.repodir) opt.repodir = "/var/lib/zpm/repo";
+
 
 	/* -l also find packages needed for libs
 	 * -j output json
@@ -408,7 +426,7 @@ int main(int ac, char *av[]) {
 	 *
 	 *  environment:
 	 *  ZPMDB - path to localdb, /var/lib/zpm/local.db
-	 *  ZPM_REPO_DIR - path to *.repo files, '/var/lib/zpm/repos'
+	 *  ZPM_REPO_DIR - path to *.repo files, '/var/lib/zpm/repo'
 	 *  ZPM_PACKAGE_DIRS - : separated paths to *.zpm files,
 	 *  '/var/lib/zpm/packages'
 	 *  ZPM_ROOT_DIR :- prepends to above paths
@@ -427,17 +445,26 @@ int main(int ac, char *av[]) {
 	 */
 
 	int output = 1;
-	while ((option = getopt(ac, av, "ljqPRDvp:r:d:M")) != -1) {
+	while ((option = getopt(ac, av, "ljqPRDvp:r:d:MiIO")) != -1) {
 		switch (option) {
 			case 'l': findlibs = 1; break;
 			case 'j': json = 1; break;
-			case 'q': output = 0;
+			case 'q': output = 0; break;
+				  /* show installed files */
+			case 'i': opt.matchinstalled = 1; break;
+			case 'I': opt.suppressinstalled = 1; break;
+				  /* only find localdb pkgs if installed */
+			case 'O': opt.onlylocalinstalled = 1; break;
 			case 'd': opt.localdb = optarg; break;
 			case 'p': opt.pkgdir = optarg; break;
 			case 'r': opt.repodir = optarg; break;
 			case 'P': opt.pkgdir = 0; break;
 			case 'R': opt.repodir = 0; break;
 			case 'D': opt.localdb = 0; break;
+				  /* matchallpkgfile means look at
+				   * all .zpm files, not just ones
+				   * that have the pkgid string prefix
+				   */
 			case 'M': opt.matchallpkgfile = 1; break;
 			case 'v': opt.verbose++; break;
 			default:
@@ -456,7 +483,6 @@ int main(int ac, char *av[]) {
 		}
 	}
 
-
 	if (!find_globs(&opt)) {
 		fprintf(stderr, "bad globs\n");
 		return 3;
@@ -484,7 +510,10 @@ int main(int ac, char *av[]) {
 	int arg;
 	for (arg = argn; arg < ac; arg++) {
 		found = find_package(av[arg], &opt);
-		if (found) {
+		if (found && (opt.matchinstalled || !found->installed)) {
+			if (found->installed && opt.suppressinstalled) {
+				continue;
+			}
 			jsw_hinsert(packages, found->id, found->file);
 			jsw_hinsert(check, found->id, found->file);
 			free(found->id);
@@ -498,10 +527,15 @@ int main(int ac, char *av[]) {
 
 	if (findlibs) {
 		checklibs(&opt, check, forlibs, nolib);
+		/* remove from forlibs anything already explicitly
+		 * in packages
+		 */
 	}
 
 	if (output) {
-		print_pkghash(packages, json);
+		if (jsw_hsize(packages)) {
+			print_pkghash(packages, json);
+		}
 		if (jsw_hsize(forlibs)) {
 			print_pkghash(forlibs, json);
 		}