From: jbj Date: Sat, 7 Dec 2002 05:48:45 +0000 (+0000) Subject: Handle (N,EVR,Flags) Provide:/Require: triple. X-Git-Tag: rpm-4.4-release~820 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=704ad49b02dbe1fbb7fc2189900f26d5a0b15c3e;p=platform%2Fupstream%2Frpm.git Handle (N,EVR,Flags) Provide:/Require: triple. CVS patchset: 5918 CVS date: 2002/12/07 05:48:45 --- diff --git a/build/rpmfc.c b/build/rpmfc.c index 0747e9f..8c7f3af 100644 --- a/build/rpmfc.c +++ b/build/rpmfc.c @@ -6,6 +6,7 @@ #include #include +#define _RPMDS_INTERNAL #include #include @@ -16,6 +17,7 @@ #include "debug.h" /*@access fmagic @*/ +/*@access rpmds @*/ /*@unchecked@*/ int _rpmfc_debug; @@ -272,6 +274,25 @@ static int rpmfcSaveArg(/*@out@*/ ARGV_t * argvp, const char * key) return rc; } +static char * rpmfcFileDep(char * buf, int ix, rpmds this) + /*@modifies buf @*/ +{ + int_32 tagN = rpmdsTagN(this); + char deptype = 'X'; + + switch (tagN) { + case RPMTAG_PROVIDENAME: + deptype = 'P'; + break; + case RPMTAG_REQUIRENAME: + deptype = 'R'; + break; + } + sprintf(buf, "%08d%c %s %s 0x%08x", ix, deptype, + rpmdsN(this), rpmdsEVR(this), rpmdsFlags(this)); + return buf; +}; + /** * Run per-interpreter dependency helper. * @param fc file classifier @@ -289,13 +310,15 @@ static int rpmfcHelper(rpmfc fc, unsigned char deptype, const char * nsdep) StringBuf sb_stdout = NULL; StringBuf sb_stdin; const char *av[2]; - ARGV_t * depsp; + rpmds * depsp, this; + const char * N; + const char * EVR; + int_32 Flags, dsContext, tagN; ARGV_t pav; + const char * s; int pac; int xx; int i; - size_t ns; - char * t; switch (deptype) { default: @@ -304,10 +327,14 @@ static int rpmfcHelper(rpmfc fc, unsigned char deptype, const char * nsdep) case 'P': xx = snprintf(buf, sizeof(buf), "%%{?__%s_provides}", nsdep); depsp = &fc->provides; + dsContext = RPMSENSE_FIND_PROVIDES; + tagN = RPMTAG_PROVIDENAME; break; case 'R': xx = snprintf(buf, sizeof(buf), "%%{?__%s_requires}", nsdep); depsp = &fc->requires; + dsContext = RPMSENSE_FIND_REQUIRES; + tagN = RPMTAG_REQUIRENAME; break; } buf[sizeof(buf)-1] = '\0'; @@ -326,31 +353,39 @@ static int rpmfcHelper(rpmfc fc, unsigned char deptype, const char * nsdep) pac = argvCount(pav); if (pav) for (i = 0; i < pac; i++) { - t = buf; - *t = '\0'; - t = stpcpy(t, pav[i]); - if (pav[i+1] && strchr("!=<>", *pav[i+1])) { + N = pav[i]; + EVR = ""; + Flags = dsContext; + if (pav[i+1] && strchr("=<>", *pav[i+1])) { i++; - *t++ = ' '; - t = stpcpy(t, pav[i]); - if (pav[i+1]) { - i++; - *t++ = ' '; - t = stpcpy(t, pav[i]); + for (s = pav[i]; *s; s++) { + switch(*s) { + default: +assert(*s != '\0'); + /*@switchbreak@*/ break; + case '=': + Flags |= RPMSENSE_EQUAL; + /*@switchbreak@*/ break; + case '<': + Flags |= RPMSENSE_LESS; + /*@switchbreak@*/ break; + case '>': + Flags |= RPMSENSE_GREATER; + /*@switchbreak@*/ break; + } } + i++; + EVR = pav[i]; +assert(EVR != NULL); } - ns = strlen(buf); - /* Add to package dependencies. */ - xx = rpmfcSaveArg(depsp, buf); + this = rpmdsSingle(tagN, N, EVR, Flags); + xx = rpmdsMerge(depsp, this); /* Add to file dependencies. */ - if (ns < (sizeof(buf) - ns - 64)) { - t = buf + ns + 1; - *t = '\0'; - sprintf(t, "%08d%c %s", fc->ix, deptype, buf); - xx = rpmfcSaveArg(&fc->ddict, t); - } + xx = rpmfcSaveArg(&fc->ddict, rpmfcFileDep(buf, fc->ix, this)); + + this = rpmdsFree(this); } pav = argvFree(pav); @@ -474,8 +509,8 @@ int nrequires; if (msg) fprintf(fp, "===================================== %s\n", msg); -nprovides = argvCount(fc->provides); -nrequires = argvCount(fc->requires); +nprovides = rpmdsCount(fc->provides); +nrequires = rpmdsCount(fc->requires); if (fc) for (fx = 0; fx < fc->nfiles; fx++) { @@ -514,15 +549,17 @@ assert(depval != NULL); /*@switchbreak@*/ break; case 'P': assert(ix < nprovides); - depval = fc->provides[ix]; + (void) rpmdsSetIx(fc->provides, ix); + depval = rpmdsDNEVR(fc->provides); /*@switchbreak@*/ break; case 'R': assert(ix < nrequires); - depval = fc->requires[ix]; + (void) rpmdsSetIx(fc->requires, ix); + depval = rpmdsDNEVR(fc->requires); /*@switchbreak@*/ break; } if (depval) - fprintf(fp, "\t%c %s\n", deptype, depval); + fprintf(fp, "\t%s\n", depval); } } } @@ -538,8 +575,8 @@ rpmfc rpmfcFree(rpmfc fc) fc->fddictn = argiFree(fc->fddictn); fc->ddict = argvFree(fc->ddict); fc->ddictx = argiFree(fc->ddictx); - fc->provides = argvFree(fc->provides); - fc->requires = argvFree(fc->requires); + fc->provides = rpmdsFree(fc->provides); + fc->requires = rpmdsFree(fc->requires); } fc = _free(fc); return NULL; @@ -563,12 +600,10 @@ static int rpmfcSCRIPT(rpmfc fc) { const char * fn = fc->fn[fc->ix]; const char * bn; - unsigned char deptype; + rpmds this; char buf[BUFSIZ]; FILE * fp; char * s, * se; - size_t ns; - char * t; int i; struct stat sb, * st = &sb; int xx; @@ -586,14 +621,12 @@ static int rpmfcSCRIPT(rpmfc fc) } /* Look for #! interpreter in first 10 lines. */ - deptype = 'R'; for (i = 0; i < 10; i++) { s = fgets(buf, sizeof(buf) - 1, fp); if (s == NULL || ferror(fp) || feof(fp)) break; s[sizeof(buf)-1] = '\0'; - ns = strlen(s); if (!(s[0] == '#' && s[1] == '!')) continue; s += 2; @@ -610,17 +643,16 @@ static int rpmfcSCRIPT(rpmfc fc) /*@innerbreak@*/ break; } *se = '\0'; + se++; /* Add to package requires. */ - xx = rpmfcSaveArg(&fc->requires, s); + this = rpmdsSingle(RPMTAG_REQUIRENAME, s, "", RPMSENSE_FIND_REQUIRES); + xx = rpmdsMerge(&fc->requires, this); /* Add to file requires. */ - if (ns < (sizeof(buf) - ns - 64)) { - t = se + 1; - *t = '\0'; - sprintf(t, "%08d%c %s", fc->ix, deptype, s); - xx = rpmfcSaveArg(&fc->ddict, t); - } + xx = rpmfcSaveArg(&fc->ddict, rpmfcFileDep(se, fc->ix, this)); + + this = rpmdsFree(this); /* Set color based on interpreter name. */ bn = basename(s); @@ -671,8 +703,8 @@ static int rpmfcELF(rpmfc fc) const char * s; unsigned char deptype; const char * soname = NULL; - ARGV_t * depsp; - const char * depval; + rpmds * depsp, this; + int_32 tagN, dsContext; char * t; int xx; int isElf64; @@ -735,21 +767,24 @@ static int rpmfcELF(rpmfc fc) } else if (soname != NULL) { buf[0] = '\0'; t = buf; - sprintf(t, "%08d%c ", fc->ix, deptype); - t += strlen(t); - depval = t; t = stpcpy( stpcpy( stpcpy( stpcpy(t, soname), "("), s), ")"); #if !defined(__alpha__) if (isElf64) t = stpcpy(t, "(64bit)"); #endif + t++; /* Add to package provides. */ - xx = rpmfcSaveArg(&fc->provides, depval); + this = rpmdsSingle(RPMTAG_PROVIDES, + buf, "", RPMSENSE_FIND_PROVIDES); + xx = rpmdsMerge(&fc->provides, this); /* Add to file dependencies. */ - xx = rpmfcSaveArg(&fc->ddict, buf); + xx = rpmfcSaveArg(&fc->ddict, + rpmfcFileDep(t, fc->ix, this)); + + this = rpmdsFree(this); } auxoffset += aux->vda_next; } @@ -786,21 +821,23 @@ static int rpmfcELF(rpmfc fc) if (soname != NULL) { buf[0] = '\0'; t = buf; - sprintf(t, "%08d%c ", fc->ix, deptype); - t += strlen(t); - depval = t; t = stpcpy( stpcpy( stpcpy( stpcpy(t, soname), "("), s), ")"); #if !defined(__alpha__) if (isElf64) t = stpcpy(t, "(64bit)"); #endif + t++; - /* Add to package requires. */ - xx = rpmfcSaveArg(&fc->requires, depval); + /* Add to package dependencies. */ + this = rpmdsSingle(RPMTAG_REQUIRENAME, + buf, "", RPMSENSE_FIND_REQUIRES); + xx = rpmdsMerge(&fc->requires, this); /* Add to file dependencies. */ - xx = rpmfcSaveArg(&fc->ddict, buf); + xx = rpmfcSaveArg(&fc->ddict, + rpmfcFileDep(t, fc->ix, this)); + this = rpmdsFree(this); } auxoffset += aux->vna_next; } @@ -823,14 +860,20 @@ static int rpmfcELF(rpmfc fc) case DT_NEEDED: /* Add to package requires. */ deptype = 'R'; - s = elf_strptr(elf, shdr->sh_link, dyn->d_un.d_val); depsp = &fc->requires; + tagN = RPMTAG_REQUIRENAME; + dsContext = RPMSENSE_FIND_REQUIRES; + s = elf_strptr(elf, shdr->sh_link, dyn->d_un.d_val); +assert(s != NULL); /*@switchbreak@*/ break; case DT_SONAME: /* Add to package provides. */ deptype = 'P'; depsp = &fc->provides; + tagN = RPMTAG_PROVIDENAME; + dsContext = RPMSENSE_FIND_PROVIDES; s = elf_strptr(elf, shdr->sh_link, dyn->d_un.d_val); +assert(s != NULL); /*@switchbreak@*/ break; } if (s == NULL) @@ -838,21 +881,23 @@ static int rpmfcELF(rpmfc fc) buf[0] = '\0'; t = buf; - sprintf(t, "%08d%c ", fc->ix, deptype); - t += strlen(t); - depval = t; t = stpcpy(t, s); #if !defined(__alpha__) if (isElf64) t = stpcpy(t, "()(64bit)"); #endif + t++; - /* Add to package requires. */ - xx = rpmfcSaveArg(depsp, depval); + /* Add to package dependencies. */ + this = rpmdsSingle(tagN, buf, "", dsContext); + xx = rpmdsMerge(depsp, this); /* Add to file dependencies. */ - xx = rpmfcSaveArg(&fc->ddict, buf); + xx = rpmfcSaveArg(&fc->ddict, + rpmfcFileDep(t, fc->ix, this)); + + this = rpmdsFree(this); } } /*@switchbreak@*/ break; @@ -888,12 +933,16 @@ int rpmfcApply(rpmfc fc) { const char * s; char * se; - ARGV_t dav, davbase; + rpmds this; + const char * N; + const char * EVR; + int_32 Flags; rpmfcApplyTbl fcat; unsigned char deptype; int nddict; int previx; unsigned int val; + int dix; int ix; int i; int xx; @@ -916,23 +965,34 @@ int rpmfcApply(rpmfc fc) assert(se != NULL); deptype = *se++; se++; - - davbase = NULL; + N = se; + while (*se && *se != ' ') + se++; + *se++ = '\0'; + EVR = se; + while (*se && *se != ' ') + se++; + *se++ = '\0'; + Flags = strtol(se, NULL, 16); + + dix = -1; switch (deptype) { default: -assert(davbase != NULL); /*@switchbreak@*/ break; case 'P': - davbase = fc->provides; + this = rpmdsSingle(RPMTAG_PROVIDENAME, N, EVR, Flags); + dix = rpmdsFind(fc->provides, this); + this = rpmdsFree(this); /*@switchbreak@*/ break; case 'R': - davbase = fc->requires; + this = rpmdsSingle(RPMTAG_REQUIRENAME, N, EVR, Flags); + dix = rpmdsFind(fc->requires, this); + this = rpmdsFree(this); /*@switchbreak@*/ break; } - dav = argvSearch(davbase, se, NULL); -assert(dav != NULL); - val = (deptype << 24) | ((dav - davbase) & 0x00ffffff); +assert(dix >= 0); + val = (deptype << 24) | (dix & 0x00ffffff); xx = argiAdd(&fc->ddictx, -1, val); if (previx != ix) { @@ -1220,7 +1280,6 @@ int rpmfcGenerateDepends(const Spec spec, Package pkg) rpmfi fi = pkg->cpioList; rpmfc fc = NULL; rpmds ds; - const char * DNEVR; int scareMem = 0; ARGV_t av; int ac = rpmfiFC(fi); @@ -1256,32 +1315,25 @@ int rpmfcGenerateDepends(const Spec spec, Package pkg) av[c] = xstrdup(rpmfiFN(fi)); av[ac] = NULL; - /* Build file class dictionary. */ fc = rpmfcNew(); - xx = rpmfcClassify(fc, av); /* Copy (and delete) manually generated dependencies to dictionary. */ ds = rpmdsNew(pkg->header, RPMTAG_PROVIDENAME, scareMem); - ds = rpmdsInit(ds); - if (ds != NULL) - while (rpmdsNext(ds) >= 0) { - DNEVR = rpmdsDNEVR(ds); - if (DNEVR == NULL) - continue; - xx = rpmfcSaveArg(&fc->provides, DNEVR+2); - } + rpmdsMerge(&fc->provides, ds); ds = rpmdsFree(ds); + xx = headerRemoveEntry(pkg->header, RPMTAG_PROVIDENAME); + xx = headerRemoveEntry(pkg->header, RPMTAG_PROVIDEVERSION); + xx = headerRemoveEntry(pkg->header, RPMTAG_PROVIDEFLAGS); ds = rpmdsNew(pkg->header, RPMTAG_REQUIRENAME, scareMem); - ds = rpmdsInit(ds); - if (ds != NULL) - while (rpmdsNext(ds) >= 0) { - DNEVR = rpmdsDNEVR(ds); - if (DNEVR == NULL) - continue; - xx = rpmfcSaveArg(&fc->requires, DNEVR+2); - } + rpmdsMerge(&fc->requires, ds); ds = rpmdsFree(ds); + xx = headerRemoveEntry(pkg->header, RPMTAG_REQUIRENAME); + xx = headerRemoveEntry(pkg->header, RPMTAG_REQUIREVERSION); + xx = headerRemoveEntry(pkg->header, RPMTAG_REQUIREFLAGS); + + /* Build file class dictionary. */ + xx = rpmfcClassify(fc, av); /* Build file/package dependency dictionary. */ xx = rpmfcApply(fc); @@ -1309,11 +1361,37 @@ assert(ac == c); xx = headerAddEntry(pkg->header, RPMTAG_FILECLASS, RPM_INT32_TYPE, p, c); + /* Add Provides: */ + if (fc->provides != NULL && (c = fc->provides->Count) > 0) { + p = (const void **) fc->provides->N; + xx = headerAddEntry(pkg->header, RPMTAG_PROVIDENAME, RPM_STRING_ARRAY_TYPE, + p, c); + p = (const void **) fc->provides->EVR; + xx = headerAddEntry(pkg->header, RPMTAG_PROVIDEVERSION, RPM_STRING_ARRAY_TYPE, + p, c); + p = (const void **) fc->provides->Flags; + xx = headerAddEntry(pkg->header, RPMTAG_PROVIDEFLAGS, RPM_INT32_TYPE, + p, c); + } + + /* Add Requires: */ + if (fc->requires != NULL && (c = fc->requires->Count) > 0) { + p = (const void **) fc->requires->N; + xx = headerAddEntry(pkg->header, RPMTAG_REQUIRENAME, RPM_STRING_ARRAY_TYPE, + p, c); + p = (const void **) fc->requires->EVR; + xx = headerAddEntry(pkg->header, RPMTAG_REQUIREVERSION, RPM_STRING_ARRAY_TYPE, + p, c); + p = (const void **) fc->requires->Flags; + xx = headerAddEntry(pkg->header, RPMTAG_REQUIREFLAGS, RPM_INT32_TYPE, + p, c); + } + /* Add dependency dictionary(#dependencies) */ - p = (const void **) argvData(fc->ddict); - c = argvCount(fc->ddict); + p = (const void **) argiData(fc->ddictx); + c = argiCount(fc->ddictx); if (p != NULL) - xx = headerAddEntry(pkg->header, RPMTAG_DEPENDSDICT, RPM_STRING_ARRAY_TYPE, + xx = headerAddEntry(pkg->header, RPMTAG_DEPENDSDICT, RPM_INT32_TYPE, p, c); /* Add per-file dependency (start,number) pairs (#files) */ diff --git a/build/rpmfc.h b/build/rpmfc.h index 144d19a..a682bae 100644 --- a/build/rpmfc.h +++ b/build/rpmfc.h @@ -29,8 +29,8 @@ struct rpmfc_s { ARGV_t ddict; /*!< (#dependencies) file depends dictionary */ ARGI_t ddictx; /*!< (#dependencies) file->dependency mapping */ - ARGV_t provides; /*!< (#provides) package provides */ - ARGV_t requires; /*!< (#requires) package requires */ + rpmds provides; /*!< (#provides) package provides */ + rpmds requires; /*!< (#requires) package requires */ StringBuf sb_java; /*!< concatenated list of java colored files. */ StringBuf sb_perl; /*!< concatenated list of perl colored files. */ diff --git a/lib/Makefile.am b/lib/Makefile.am index ffe6e08..35260b0 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -79,6 +79,10 @@ getdate.c: getdate.y BUILT_SOURCES = getdate.c # rpmlib.lcd +noinst_PROGRAMS = tds +tds_SOURCES = tds.c +tds_LDFLAGS = @LDFLAGS_STATIC@ ./librpm.la + rpmlib.lcd: Makefile.am ${librpm_la_SOURCES} ${pkginc_HEADERS} ${noinst_HEADERS} -lclint ${DEFS} ${INCLUDES} ${librpm_la_SOURCES} -dump $@ 2>/dev/null @@ -93,6 +97,9 @@ lint: th: th.c librpm.la $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(mylibpaths) $(mylibs) $(LIBS) +#tds: tds.c librpm.la +# $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< librpm.la +# trb: trb.o librpm.la $(LINK) @LDFLAGS_STATIC@ $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ trb.o $(mylibs) $(LIBS) diff --git a/lib/rpmds.c b/lib/rpmds.c index 5885475..2645bae 100644 --- a/lib/rpmds.c +++ b/lib/rpmds.c @@ -517,6 +517,159 @@ rpmds rpmdsInit(/*@null@*/ rpmds ds) /*@=refcounttrans@*/ } +static const char ** rpmdsDupArgv(const char ** argv, int argc) + /*@*/ +{ + const char ** av; + size_t nb = 0; + int ac = 0; + char * t; + + for (ac = 0; ac < argc; ac++) { +assert(argv[ac] != NULL); + nb += strlen(argv[ac]) + 1; + } + nb += (ac + 1) * sizeof(*av); + + av = xmalloc(nb); + t = (char *) (av + ac + 1); + for (ac = 0; ac < argc; ac++) { + av[ac] = t; + t = stpcpy(t, argv[ac]) + 1; + } + av[ac] = NULL; + return av; +} + +static rpmds rpmdsDup(const rpmds this) + /*@*/ +{ + rpmds ds = xcalloc(1, sizeof(*ds)); + size_t nb; + + ds->h = (this->h ? headerLink(this->h) : NULL); + ds->Type = this->Type; + ds->tagN = this->tagN; + ds->Count = this->Count; + ds->i = this->i; + ds->l = this->l; + ds->u = this->u; + + nb = (ds->Count+1) * sizeof(*ds->N); + ds->N = (ds->h + ? memcpy(xmalloc(nb), this->N, nb) + : rpmdsDupArgv(this->N, this->Count) ); + ds->Nt = this->Nt; + + nb = (ds->Count+1) * sizeof(*ds->EVR); + ds->EVR = (ds->h + ? memcpy(xmalloc(nb), this->EVR, nb) + : rpmdsDupArgv(this->EVR, this->Count) ); + ds->EVRt = this->EVRt; + + nb = (ds->Count * sizeof(*ds->Flags)); + ds->Flags = (ds->h + ? this->Flags + : memcpy(xmalloc(nb), this->Flags, nb) ); + ds->Ft = this->Ft; + + return rpmdsLink(ds, (ds ? ds->Type : NULL)); + +} + +int rpmdsFind(rpmds ds, rpmds this) +{ + int comparison; + + ds->l = 0; + ds->u = ds->Count; + while (ds->l < ds->u) { + ds->i = (ds->l + ds->u) / 2; + + comparison = strcmp(this->N[this->i], ds->N[ds->i]); + if (comparison == 0) + comparison = strcmp(this->EVR[this->i], ds->EVR[ds->i]); + if (comparison == 0) + comparison = (this->Flags[this->i] - ds->Flags[ds->i]); + + if (comparison < 0) + ds->u = ds->i; + else if (comparison > 0) + ds->l = ds->i + 1; + else { + return ds->i; + } + } + return -1; +} + +int rpmdsMerge(rpmds * dsp, rpmds this) +{ + rpmds ds; + const char ** N; + const char ** EVR; + int_32 * Flags; + int j; +int save; + + if (dsp == NULL || this == NULL) + return -1; + + /* If not initialized yet, dup the 1st entry. */ + if (*dsp == NULL) { + save = this->Count; + this->Count = 1; + *dsp = rpmdsDup(this); + this->Count = save; + } + ds = *dsp; + + /* + * Add new entries. + */ +save = this->i; + this = rpmdsInit(this); + while (rpmdsNext(this) >= 0) { + /* + * If this entry is already present, don't bother. + */ + if (rpmdsFind(ds, this) >= 0) + continue; + + /* + * Insert new entry. + */ + for (j = ds->Count; j > ds->u; j--) + ds->N[j] = ds->N[j-1]; + ds->N[ds->u] = this->N[this->i]; + N = rpmdsDupArgv(ds->N, ds->Count+1); + ds->N = _free(ds->N); + ds->N = N; + + for (j = ds->Count; j > ds->u; j--) + ds->EVR[j] = ds->EVR[j-1]; + ds->EVR[ds->u] = this->EVR[this->i]; + EVR = rpmdsDupArgv(ds->EVR, ds->Count+1); + ds->EVR = _free(ds->EVR); + ds->EVR = EVR; + + Flags = xmalloc((ds->Count+1) * sizeof(*Flags)); + if (ds->u > 0) + memcpy(Flags, ds->Flags, ds->u * sizeof(*Flags)); + if (ds->u < ds->Count) + memcpy(Flags + ds->u + 1, ds->Flags + ds->u, (ds->Count - ds->u) * sizeof(*Flags)); + Flags[ds->u] = this->Flags[this->i]; + ds->Flags = _free(ds->Flags); + ds->Flags = Flags; + + ds->i = ds->Count; + ds->Count++; + + } +this->i = save; + return 0; +} + /** * Split EVR into epoch, version, and release components. * @param evr [epoch:]version[-release] string diff --git a/lib/rpmds.h b/lib/rpmds.h index 1808757..a121fdb 100644 --- a/lib/rpmds.h +++ b/lib/rpmds.h @@ -27,25 +27,24 @@ extern int _rpmds_nopromote; * A package dependency set. */ struct rpmds_s { - int i; /*!< Element index. */ - /*@observer@*/ const char * Type; /*!< Tag name. */ /*@only@*/ /*@null@*/ const char * DNEVR; /*!< Formatted dependency string. */ - - rpmTag tagN; /*!< Header tag. */ /*@refcounted@*/ /*@null@*/ Header h; /*!< Header for dependency set (or NULL) */ - /*@only@*/ const char ** N; /*!< Name. */ /*@only@*/ const char ** EVR; /*!< Epoch-Version-Release. */ /*@only@*/ int_32 * Flags; /*!< Flags identifying context/comparison. */ + rpmTag tagN; /*!< Header tag. */ rpmTagType Nt, EVRt, Ft; /*!< Tag data types. */ int_32 Count; /*!< No. of elements */ + int i; /*!< Element index. */ + unsigned l; /*!< Low element (bsearch). */ + unsigned u; /*!< High element (bsearch). */ int nopromote; /*!< Don't promote Epoch: in rpmdsCompare()? */ /*@refs@*/ int nrefs; /*!< Reference count. */ @@ -268,6 +267,26 @@ rpmds rpmdsInit(/*@null@*/ rpmds ds) /*@modifies ds @*/; /** + * Find a dependency set element using binary search. + * @param ds dependency set to search + * @param this dependency set element to find. + * @return dependency index (or -1 if not found) + */ +/*@null@*/ +int rpmdsFind(rpmds ds, rpmds this) + /*@*/; + +/** + * Merge a dependency set maintaining (N,EVR,Flags) sorted order. + * @retval *dsp (merged) dependency set + * @param this dependency set to merge + * @return (merged) dependency index + */ +/*@null@*/ +int rpmdsMerge(/*@out@*/ rpmds * dsp, rpmds this) + /*@*/; + +/** * Compare two versioned dependency ranges, looking for overlap. * @param A 1st dependency * @param B 2nd dependency diff --git a/lib/tds.c b/lib/tds.c new file mode 100644 index 0000000..e26cf27 --- /dev/null +++ b/lib/tds.c @@ -0,0 +1,39 @@ +#include "system.h" + +#include "rpmlib.h" + +#include "rpmds.h" + +#include "debug.h" + +extern int _rpmds_debug; + +int main(int argc, char *argv[]) +{ + rpmTag tagN = RPMTAG_REQUIRENAME; + rpmds ds = NULL; + rpmds dsA; + rpmds dsA1; + rpmds dsA2; + rpmds dsB; + rpmds dsC; + + _rpmds_debug = 0; + dsA = rpmdsSingle(tagN, "A", "0", RPMSENSE_EQUAL); + dsA1 = rpmdsSingle(tagN, "A", "0", RPMSENSE_LESS); + dsA2 = rpmdsSingle(tagN, "A", "0", RPMSENSE_GREATER); + dsB = rpmdsSingle(tagN, "B", "1", RPMSENSE_LESS); + dsC = rpmdsSingle(tagN, "C", "2", RPMSENSE_GREATER); + + rpmdsMerge(&ds, dsA2); + rpmdsMerge(&ds, dsA); + rpmdsMerge(&ds, dsC); + rpmdsMerge(&ds, dsB); + rpmdsMerge(&ds, dsA1); + + ds = rpmdsInit(ds); + while (rpmdsNext(ds) >= 0) + fprintf(stderr, "%d %s\n", rpmdsIx(ds), rpmdsDNEVR(ds)+2); + + return 0; +} diff --git a/tools/rpmdeps.c b/tools/rpmdeps.c index 31d4ccc..6848750 100644 --- a/tools/rpmdeps.c +++ b/tools/rpmdeps.c @@ -15,6 +15,18 @@ static int print_provides; /*@unchecked@*/ static int print_requires; +static void rpmdsPrint(const char * msg, rpmds ds, FILE * fp) +{ + if (fp == NULL) fp = stderr; + + if (msg) + fprintf(fp, "===================================== %s\n", msg); + + ds = rpmdsInit(ds); + while (rpmdsNext(ds) >= 0) + fprintf(fp, "%s\n", rpmdsDNEVR(ds)+2); +} + static struct poptOption optionsTable[] = { { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmcliAllPoptTable, 0, @@ -89,9 +101,9 @@ rpmfcPrint(buf, fc, NULL); } if (print_provides) - argvPrint(NULL, fc->provides, stdout); + rpmdsPrint(NULL, fc->provides, stdout); if (print_requires) - argvPrint(NULL, fc->requires, stdout); + rpmdsPrint(NULL, fc->requires, stdout); fc = rpmfcFree(fc);