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

Hack in hdlist queries. 

CVS patchset: 7463
CVS date: 2004/10/14 15:45:41
This commit is contained in:
jbj 2004-10-14 15:45:41 +00:00
parent 9e30825226
commit d5bce7dc38
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/rpmgi.c
View File

@ -14,6 +14,8 @@
/*@unchecked@*/
int _rpmgi_debug = 0;
static const char * hdlistpath = "/usr/share/comps/i386/hdlist";
rpmgi XrpmgiUnlink(rpmgi gi, const char * msg, const char * fn, unsigned ln)
{
if (gi == NULL) return NULL;
@ -68,6 +70,10 @@ fprintf(stderr, "*** gi %p\t%p[%d]\n", gi, gi->argv, gi->argc);
gi->ftsp = NULL;
gi->fts = NULL;
}
if (gi->fd != NULL) {
(void) Fclose(gi->fd);
gi->fd = NULL;
}
gi->mi = rpmdbFreeIterator(gi->mi);
gi->ts = rpmtsFree(gi->ts);
@ -97,6 +103,7 @@ fprintf(stderr, "*** gi %p\t%p\n", gi, gi->mi);
break;
case RPMGI_HDLIST:
gi->fd = Fopen(hdlistpath, "r.ufdio");
break;
case RPMGI_ARGLIST:
case RPMGI_FTSWALK:
@ -189,6 +196,14 @@ const char * rpmgiNext(/*@null@*/ rpmgi gi)
}
break;
case RPMGI_HDLIST:
h = headerRead(gi->fd, HEADER_MAGIC_YES);
if (h != NULL) {
val = rpmgiPathOrQF(gi, "hdlist", &h);
} else {
(void) Fclose(gi->fd);
gi->fd = NULL;
gi->i = -1;
}
break;
case RPMGI_ARGLIST:
if (gi->argv != NULL && gi->argv[gi->i] != NULL) {
@ -244,7 +259,7 @@ int rpmgiSetQueryFormat(rpmgi gi, const char * queryFormat)
if (gi != NULL) {
gi->queryFormat = _free(gi->queryFormat);
gi->queryFormat = xstrdup(queryFormat);
gi->queryFormat = (queryFormat != NULL ? xstrdup(queryFormat) : NULL);
}
return rc;

3
lib/rpmgi.h
View File

@ -42,6 +42,9 @@ struct rpmgi_s {
/*@dependent@*/
rpmdbMatchIterator mi;
/*@refcounted@*/
FD_t fd;
/*@only@*/
const char * queryFormat;