Use rpmgi glob and manifest load for --package.

Bugs:
 * @todo An empty file read as manifest truncates argv returning RPMRC_NOTFOUND.
 * @todo Errors, e.g. non-existent path in manifest, will terminate iteration.
 * @todo Chained manifests lose an arg someplace.

CVS patchset: 7507
CVS date: 2004/10/25 00:34:08

4 files changed, 25 insertions, 109 deletions

diff --git a/lib/manifest.c b/lib/manifest.c
index 0374516c5..eeca811af 100644
--- a/lib/manifest.c
+++ b/lib/manifest.c
@@ -130,6 +130,8 @@ rpmRC rpmReadPackageManifest(FD_t fd, int * argcPtr, const char *** argvPtr)
     rpmrc = rpmGlob(s, &ac, &av);
     if (rpmrc != RPMRC_OK) goto exit;
 
+    rpmMessage(RPMMESS_DEBUG, _("adding %d args from manifest.\n"), ac);
+
     /* Find 1st existing unprocessed arg. */
     for (i = 0; i < argc; i++)
 	if (argv && argv[i]) break;
diff --git a/lib/query.c b/lib/query.c
index 9e401d24a..9864c46a0 100644
--- a/lib/query.c
+++ b/lib/query.c
@@ -364,9 +364,13 @@ static int rpmgiShowMatches(QVA_t qva, rpmts ts)
     int ec = 0;
 
     while (rpmgiNext(gi) == RPMRC_OK) {
+	Header h;
 	int rc;
 
-	if ((rc = qva->qva_showPackage(qva, ts, rpmgiHeader(gi))) != 0)
+	h = rpmgiHeader(gi);
+	if (h == NULL)		/* XXX perhaps stricter break instead? */
+	    continue;
+	if ((rc = qva->qva_showPackage(qva, ts, h)) != 0)
 	    ec = rc;
 	if (qva->qva_source == RPMQV_DBOFFSET)
 	    break;
@@ -426,104 +430,8 @@ int rpmQueryVerify(QVA_t qva, rpmts ts, const char * arg)
     /*@-branchstate@*/
     switch (qva->qva_source) {
     case RPMQV_RPM:
-    {	int ac = 0;
-	const char * fileURL = NULL;
-	rpmRC rpmrc;
-
-	rc = rpmGlob(arg, &ac, &av);
-	if (rc) return 1;
-
-restart:
-	for (i = 0; i < ac; i++) {
-	    FD_t fd;
-
-	    fileURL = _free(fileURL);
-	    fileURL = av[i];
-	    av[i] = NULL;
-
-	    /* Try to read the header from a package file. */
-	    fd = Fopen(fileURL, "r.ufdio");
-	    if (fd == NULL || Ferror(fd)) {
-		rpmError(RPMERR_OPEN, _("open of %s failed: %s\n"), fileURL,
-			Fstrerror(fd));
-		if (fd != NULL) (void) Fclose(fd);
-		res = 1;
-		/*@loopbreak@*/ break;
-	    }
-
-    	    rpmrc = rpmReadPackageFile(ts, fd, fileURL, &h);
-
-	    (void) Fclose(fd);
-
-	    res = 0;
-	    switch (rpmrc) {
-	    default:
-#ifdef	DYING
-		rpmError(RPMERR_QUERY, _("query of %s failed\n"), fileURL);
-#endif
-		res = 1;
-		/*@switchbreak@*/ break;
-	    case RPMRC_NOTTRUSTED:
-	    case RPMRC_NOKEY:
-	    case RPMRC_OK:
-		if (h == NULL) {
-#ifdef	DYING
-		    rpmError(RPMERR_QUERY,
-			_("old format source packages cannot be queried\n"));
-#endif
-		    res = 1;
-		    /*@switchbreak@*/ break;
-		}
-
-		/* Query a package file. */
-		res = qva->qva_showPackage(qva, ts, h);
-		h = headerFree(h);
-		rpmtsEmpty(ts);
-		continue;
-		/*@notreached@*/ /*@switchbreak@*/ break;
-	    case RPMRC_NOTFOUND:
-		res = 0;
-		/*@switchbreak@*/ break;
-	    }
-	    if (res)
-		/*@loopbreak@*/ break;
-
-	    /* Try to read a package manifest. */
-	    fd = Fopen(fileURL, "r.fpio");
-	    if (fd == NULL || Ferror(fd)) {
-		rpmError(RPMERR_OPEN, _("open of %s failed: %s\n"), fileURL,
-			Fstrerror(fd));
-		if (fd != NULL) (void) Fclose(fd);
-		res = 1;
-		/*@loopbreak@*/ break;
-	    }
-	    
-	    /* Read list of packages from manifest. */
-/*@-nullstate@*/ /* FIX: *av may be NULL */
-	    res = rpmReadPackageManifest(fd, &ac, &av);
-/*@=nullstate@*/
-	    if (res != RPMRC_OK) {
-		rpmError(RPMERR_MANIFEST,
-			_("%s: not an rpm package (or package manifest): %s\n"),
-			fileURL, Fstrerror(fd));
-		res = 1;
-	    }
-	    (void) Fclose(fd);
-
-	    /* If successful, restart the query loop. */
-	    if (res == 0)
-		goto restart;
-
-	    /*@loopbreak@*/ break;
-	}
-
-	fileURL = _free(fileURL);
-	if (av) {
-	    for (i = 0; i < ac; i++)
-		av[i] = _free(av[i]);
-	    av = _free(av);
-	}
-    }	break;
+	res = rpmgiShowMatches(qva, ts);
+	break;
 
     case RPMQV_SPECFILE:
 	res = ((qva->qva_specQuery != NULL)
@@ -772,6 +680,14 @@ int rpmcliArgIter(rpmts ts, QVA_t qva, ARGV_t argv)
 	/*@=nullpass@*/
 	rpmtsEmpty(ts);
 	break;
+    case RPMQV_RPM:
+	qva->qva_gi = rpmgiNew(ts, RPMDBI_ARGLIST, NULL, 0);
+	qva->qva_rc = rpmgiSetArgs(qva->qva_gi, argv, 0, RPMGI_NONE);
+	/*@-nullpass@*/ /* FIX: argv can be NULL, cast to pass argv array */
+	ec = rpmQueryVerify(qva, ts, NULL);
+	/*@=nullpass@*/
+	rpmtsEmpty(ts);
+	break;
     default:
 	qva->qva_gi = rpmgiNew(ts, RPMDBI_ARGLIST, NULL, 0);
 	qva->qva_rc = rpmgiSetArgs(qva->qva_gi, argv, 0,
diff --git a/lib/rpmgi.c b/lib/rpmgi.c
index b446d963c..bdaa04cf7 100644
--- a/lib/rpmgi.c
+++ b/lib/rpmgi.c
@@ -54,6 +54,7 @@ static const char * ftsInfoStr(int fts_info)
 
 /**
  * Open a file after macro expanding path.
+ * @todo There are two error messages printed on header, then manifest failures.
  * @param path		file path
  * @param fmode		open mode
  * @return		file handle
@@ -135,6 +136,9 @@ static Header rpmgiReadHeader(rpmgi gi, const char * path)
 
 /**
  * Read next header from package, lazily expanding manifests as found.
+ * @todo An empty file read as manifest truncates argv returning RPMRC_NOTFOUND.
+ * @todo Errors, e.g. non-existent path in manifest, will terminate iteration.
+ * @todo Chained manifests lose an arg someplace.
  * @param gi		generalized iterator
  * @return		RPMRC_OK on success
  */
diff --git a/lib/tgi.c b/lib/tgi.c
index cb78e09c5..32ed8ec78 100644
--- a/lib/tgi.c
+++ b/lib/tgi.c
@@ -148,22 +148,16 @@ main(int argc, char *const argv[])
 
     ac = 0;
     while (rpmgiNext(gi) == RPMRC_OK) {
-	if (!(giflags & 0x3)) {
+	if (!(giflags & RPMGI_TSADD)) {
 	    const char * arg = rpmgiPathOrQF(gi);
-#ifdef	UNUSED
-	    Header h = rpmgiHeader(gi);
-	    const char * fn = rpmgiHdrPath(gi);
-	    int xx;
-#endif
-
-	    if (!(giflags & RPMGI_TSADD))
-	        fprintf(stdout, "%5d %s\n", ac, arg);
+
+	    fprintf(stdout, "%5d %s\n", ac, arg);
 	    arg = _free(arg);
 	}
 	ac++;
     }
 
-    if (giflags & RPMGI_TSADD) {
+    if (giflags & RPMGI_TSORDER) {
 	rpmtsi tsi;
 	rpmte q;
 	int i;