X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-search.c;h=b431152e690fe8ec451ed488290ad7a93cd2afe0;hb=f600cd71e6816c2c69deef5a805759bf3de2e616;hp=06439253c8b38f757bc479b428b75f318372223d;hpb=50b0480e6259c1e4bed6e6dc7990e080ceb5e855;p=zpackage

diff --git a/zpm-search.c b/zpm-search.c
index 0643925..b431152 100644
--- a/zpm-search.c
+++ b/zpm-search.c
@@ -24,6 +24,7 @@ struct search_ctl {
 	struct zpm *zpmdb;
 	glob_t repos;
 	int matchallpkgfile;
+	int verbose;
 };
 
 char *pathcat(char *dir, char *path) {
@@ -63,7 +64,7 @@ char *checkfile(char *pkgstr, char *path) {
 		return NULL;
 	}
 	
-	pkgid = zpm_findpkg(&pkgfile, pkgstr, "hash is not null");
+	pkgid = zpm_findpkg(&pkgfile, pkgstr, NULL);
 	zpm_close(&pkgfile);
 
 	return pkgid;
@@ -77,7 +78,7 @@ char *checkfileforlib(char *soname, char *path) {
 		return NULL;
 	}
 	
-	pkgid = zpm_findlib(&pkgfile, soname, "hash is not null");
+	pkgid = zpm_findlib(&pkgfile, soname, NULL);
 	if (pkgfile.error) {
 		fprintf(stderr, "sql error: %s\n", pkgfile.errmsg);
 	}
@@ -133,7 +134,6 @@ int find_globs(struct search_ctl *opt) {
 			default:
 				break;
 		}
-		globopts = GLOB_APPEND;
 		free(globstr);
 	}
 
@@ -150,20 +150,31 @@ int find_lib(char *soname, struct search_ctl *opt, struct pkgloc *pkg) {
 	if (opt->localdb) {
 		installed = zpm_findlib(opt->zpmdb, soname, "status = 'installed'");
 		if (installed) {
+			if (opt->verbose > 1) {
+				fprintf(stderr, "library %s installed via %s\n", soname, installed);
+			}
 			/* we're done, the lib is installed */
 			return 2;
 		}
 	}
 
 	for (i = 0; i < opt->repos.gl_pathc; i++) {
+		if (opt->verbose > 1) {
+			fprintf(stderr, "checking %s for %s\n", opt->repos.gl_pathv[i], soname);
+		}
 		found = checkfileforlib(soname, opt->repos.gl_pathv[i]);
 		if (found) {
+			if (opt->verbose > 1) {
+				fprintf(stderr, "found %s\n", found);
+			}
 			rv = zpm_vercmp(found, latest);
 			if (rv == 1) {
 				latest = found;
 				free(pkgfile);
 				pkgfile = strdup(opt->repos.gl_pathv[i]);
 			}
+		} else if (opt->verbose > 1) {
+			fprintf(stderr, "not found\n");
 		}
 	}
 
@@ -179,7 +190,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;
@@ -304,8 +315,14 @@ void checklibs(struct search_ctl *opts,
 			int found;
 			struct pkgloc pkginfo;
 
+			if (opts->verbose > 1) {
+				fprintf(stderr, "checking for %s\n", soname);
+			}
 			/* if it's in checked_libs, we've already looked at this one */
 			if (jsw_afind(checked_libs, soname)) {
+				if (opts->verbose > 1) {
+					fprintf(stderr, "already checked for %s\n", soname);
+				}
 				continue;
 			}
 
@@ -327,12 +344,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);
@@ -409,7 +424,7 @@ int main(int ac, char *av[]) {
 	 */
 
 	int output = 1;
-	while ((option = getopt(ac, av, "ljqPRDp:r:d:M")) != -1) {
+	while ((option = getopt(ac, av, "ljqPRDvp:r:d:M")) != -1) {
 		switch (option) {
 			case 'l': findlibs = 1; break;
 			case 'j': json = 1; break;
@@ -421,6 +436,7 @@ int main(int ac, char *av[]) {
 			case 'R': opt.repodir = 0; break;
 			case 'D': opt.localdb = 0; break;
 			case 'M': opt.matchallpkgfile = 1; break;
+			case 'v': opt.verbose++; break;
 			default:
 				  exit(EXIT_FAILURE);
 				  break;
@@ -443,6 +459,15 @@ int main(int ac, char *av[]) {
 		return 3;
 	}
 
+	if (opt.verbose > 1) {
+		unsigned int i;
+		fprintf(stderr, "globs:");
+		for (i = 0; i < opt.repos.gl_pathc; i++) {
+			fprintf(stderr, " %s", opt.repos.gl_pathv[i]);
+		}
+		fprintf(stderr, "\n");
+	}
+
 	packages = jsw_hnew(ac,NULL,(cmp_f)strcmp,(keydup_f)strdup,
 			(itemdup_f)strdup,free,free);
 	check = jsw_hnew(ac,NULL,(cmp_f)strcmp,(keydup_f)strdup,