folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Iterate on RPMQV_ALL, adding filters to match iterator from argv. 

CVS patchset: 7506
CVS date: 2004/10/24 22:25:32
This commit is contained in:
jbj 2004-10-24 22:25:32 +00:00
parent 595a207f27
commit f60aac8e5a
3 changed files with 93 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
lib/query.c
View File

@ -358,6 +358,22 @@ void rpmDisplayQueryTags(FILE * fp)
}
}
static int rpmgiShowMatches(QVA_t qva, rpmts ts)
{
rpmgi gi = qva->qva_gi;
int ec = 0;
while (rpmgiNext(gi) == RPMRC_OK) {
int rc;
if ((rc = qva->qva_showPackage(qva, ts, rpmgiHeader(gi))) != 0)
ec = rc;
if (qva->qva_source == RPMQV_DBOFFSET)
break;
}
return ec;
}
int rpmcliShowMatches(QVA_t qva, rpmts ts)
{
Header h;
@ -515,46 +531,7 @@ restart:
break;
case RPMQV_ALL:
qva->qva_mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES, NULL, 0);
if (qva->qva_mi == NULL) {
rpmError(RPMERR_QUERYINFO, _("no packages\n"));
res = 1;
} else {
if (arg != NULL)
for (av = (const char **) arg; *av != NULL; av++) {
int tag = RPMTAG_NAME;
const char * pat;
char * a, * ae;
pat = a = xstrdup(*av);
tag = RPMTAG_NAME;
/* Parse for "tag=pattern" args. */
if ((ae = strchr(a, '=')) != NULL) {
*ae++ = '\0';
tag = tagValue(a);
if (tag < 0) {
rpmError(RPMERR_QUERYINFO,
_("unknown tag: \"%s\"\n"), a);
res = 1;
}
pat = ae;
}
if (!res)
res = rpmdbSetIteratorRE(qva->qva_mi, tag, RPMMIRE_DEFAULT, pat);
a = _free(a);
if (res == 0)
continue;
qva->qva_mi = rpmdbFreeIterator(qva->qva_mi);
res = 1;
/*@loopbreak@*/ break;
}
if (!res)
res = rpmcliShowMatches(qva, ts);
}
res = rpmgiShowMatches(qva, ts);
break;
case RPMQV_GROUP:
@ -784,24 +761,21 @@ restart:
int rpmcliArgIter(rpmts ts, QVA_t qva, ARGV_t argv)
{
int gitag = RPMDBI_ARGLIST;
int gikey = NULL;
int gikeylen = 0;
int ftsOpts = 0;
rpmgiFlags giflags = RPMGI_NOGLOB|RPMGI_NOHEADER;
int ec = 0;
qva->qva_gi = rpmgiNew(ts, gitag, gikey, gikeylen);
qva->qva_rc = rpmgiSetArgs(qva->qva_gi, argv, ftsOpts, giflags);
switch (qva->qva_source) {
case RPMQV_ALL:
qva->qva_gi = rpmgiNew(ts, RPMDBI_PACKAGES, 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, (const char *) argv);
/*@=nullpass@*/
rpmtsEmpty(ts);
break;
default:
qva->qva_gi = rpmgiNew(ts, RPMDBI_ARGLIST, NULL, 0);
qva->qva_rc = rpmgiSetArgs(qva->qva_gi, argv, 0,
(RPMGI_NOGLOB|RPMGI_NOHEADER));
while (rpmgiNext(qva->qva_gi) == RPMRC_OK) {
ec += rpmQueryVerify(qva, ts, rpmgiHdrPath(qva->qva_gi));
rpmtsEmpty(ts);

82
lib/rpmgi.c
View File

@ -243,7 +243,10 @@ static rpmRC rpmgiGlobArgv(rpmgi gi, /*@null@*/ ARGV_t argv)
int ac = 0;
int xx;
if (gi->flags & RPMGI_NOGLOB) {
/* XXX Expand globs only if requested or for gi specific tags */
if ((gi->flags & RPMGI_NOGLOB)
|| !(gi->tag == RPMDBI_HDLIST || gi->tag == RPMDBI_ARGLIST || gi->tag == RPMDBI_FTSWALK))
{
if (argv != NULL) {
while (argv[ac] != NULL)
ac++;
@ -266,6 +269,61 @@ static rpmRC rpmgiGlobArgv(rpmgi gi, /*@null@*/ ARGV_t argv)
return rpmrc;
}
/**
* Return rpmdb match iterator with filters (if any) set.
* @param gi generalized iterator
* @returns RPMRC_OK on success
*/
static rpmRC rpmgiInitFilter(rpmgi gi)
/*@modifies gi @*/
{
rpmRC rpmrc = RPMRC_OK;
ARGV_t av;
int res = 0;
gi->mi = rpmtsInitIterator(gi->ts, gi->tag, gi->keyp, gi->keylen);
if (_rpmgi_debug < 0)
fprintf(stderr, "*** gi %p\tmi %p\n", gi, gi->mi);
if (gi->argv != NULL)
for (av = (const char **) gi->argv; *av != NULL; av++) {
int tag = RPMTAG_NAME;
const char * pat;
char * a, * ae;
pat = a = xstrdup(*av);
tag = RPMTAG_NAME;
/* Parse for "tag=pattern" args. */
if ((ae = strchr(a, '=')) != NULL) {
*ae++ = '\0';
tag = tagValue(a);
if (tag < 0) {
rpmError(RPMERR_QUERYINFO, _("unknown tag: \"%s\"\n"), a);
res = 1;
}
pat = ae;
}
if (!res) {
if (_rpmgi_debug < 0)
fprintf(stderr, "\tav %p[%d]: \"%s\" -> %s ~= \"%s\"\n", gi->argv, (av - gi->argv), *av, tagName(tag), pat);
res = rpmdbSetIteratorRE(gi->mi, tag, RPMMIRE_DEFAULT, pat);
}
a = _free(a);
if (res == 0)
continue;
gi->mi = rpmdbFreeIterator(gi->mi); /* XXX odd side effect? */
rpmrc = RPMRC_FAIL;
break;
}
return rpmrc;
}
rpmgi XrpmgiUnlink(rpmgi gi, const char * msg, const char * fn, unsigned ln)
{
if (gi == NULL) return NULL;
@ -294,12 +352,9 @@ rpmgi rpmgiFree(rpmgi gi)
return NULL;
if (gi->nrefs > 1)
return rpmgiUnlink(gi, NULL);
return rpmgiUnlink(gi, __FUNCTION__);
if (_rpmgi_debug < 0)
fprintf(stderr, "*** gi %p\t%p[%d]\n", gi, gi->argv, gi->argc);
(void) rpmgiUnlink(gi, NULL);
(void) rpmgiUnlink(gi, __FUNCTION__);
/*@-usereleased@*/
@ -336,7 +391,7 @@ rpmgi rpmgiNew(rpmts ts, int tag, const void * keyp, size_t keylen)
if (gi == NULL)
return NULL;
gi->ts = rpmtsLink(ts, NULL);
gi->ts = rpmtsLink(ts, __FUNCTION__);
gi->tag = tag;
gi->keyp = keyp;
gi->keylen = keylen;
@ -355,7 +410,7 @@ rpmgi rpmgiNew(rpmts ts, int tag, const void * keyp, size_t keylen)
gi->ftsp = NULL;
gi->fts = NULL;
gi = rpmgiLink(gi, NULL);
gi = rpmgiLink(gi, __FUNCTION__);
return gi;
}
@ -380,9 +435,12 @@ rpmRC rpmgiNext(/*@null@*/ rpmgi gi)
default:
case RPMDBI_PACKAGES:
if (!gi->active) {
gi->mi = rpmtsInitIterator(gi->ts, gi->tag, gi->keyp, gi->keylen);
if (_rpmgi_debug < 0)
fprintf(stderr, "*** gi %p\t%p\n", gi, gi->mi);
rpmrc = rpmgiInitFilter(gi);
if (rpmrc != RPMRC_OK) {
gi->mi = rpmdbFreeIterator(gi->mi); /* XXX unnecessary */
goto enditer;
}
rpmrc = RPMRC_NOTFOUND; /* XXX hack */
gi->active = 1;
}
if (gi->mi != NULL) { /* XXX unnecessary */
@ -391,6 +449,7 @@ fprintf(stderr, "*** gi %p\t%p\n", gi, gi->mi);
if (!(gi->flags & RPMGI_NOHEADER))
gi->h = headerLink(h);
sprintf(hnum, "%u", rpmdbGetIteratorOffset(gi->mi));
gi->hdrPath = rpmExpand("rpmdb h# ", hnum, NULL);
rpmrc = RPMRC_OK;
/* XXX header reference held by iterator, so no headerFree */
}
@ -399,7 +458,6 @@ fprintf(stderr, "*** gi %p\t%p\n", gi, gi->mi);
gi->mi = rpmdbFreeIterator(gi->mi);
goto enditer;
}
gi->hdrPath = rpmExpand("rpmdb h# ", hnum, NULL);
break;
case RPMDBI_HDLIST:
if (!gi->active) {

1
lib/rpmgi.h
View File

@ -20,6 +20,7 @@ extern int _rpmgi_debug;
/**
*/
typedef enum rpmgiFlags_e {
RPMGI_NONE = 0,
RPMGI_TSADD = (1 << 0),
RPMGI_TSORDER = (1 << 1),
RPMGI_NOGLOB = (1 << 2),