X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=ext%2Frepo_updateinfoxml.c;h=36d76b5d4733224a4b510006e0d531acf20f85ef;hb=6a68988035ea989055076d81b7ab53c7015c8c32;hp=1293ad2556c274cbc350dab485be07df22da658a;hpb=5b0d7883a182851bee1f5d67164d747ba00e4d6d;p=platform%2Fupstream%2Flibsolv.git diff --git a/ext/repo_updateinfoxml.c b/ext/repo_updateinfoxml.c index 1293ad2..36d76b5 100644 --- a/ext/repo_updateinfoxml.c +++ b/ext/repo_updateinfoxml.c @@ -8,16 +8,14 @@ #define _GNU_SOURCE #define _XOPEN_SOURCE /* glibc2 needs this */ #include -#include -#include #include #include #include -#include #include #include "pool.h" #include "repo.h" +#include "solv_xmlparser.h" #include "repo_updateinfoxml.h" #define DISABLE_SPLIT #include "tools_util.h" @@ -39,6 +37,7 @@ * * * Fedora 8 + * * * imlib-debuginfo-1.9.15-6.fc8.ppc64.rpm * True @@ -72,19 +71,11 @@ enum state { STATE_RELOGIN, STATE_RIGHTS, STATE_SEVERITY, + STATE_MODULE, NUMSTATES }; -struct stateswitch { - enum state from; - char *ename; - enum state to; - int docontent; -}; - - -/* !! must be sorted by first column !! */ -static struct stateswitch stateswitches[] = { +static struct solv_xmlparser_element stateswitches[] = { { STATE_START, "updates", STATE_UPDATES, 0 }, { STATE_START, "update", STATE_UPDATE, 0 }, { STATE_UPDATES, "update", STATE_UPDATE, 0 }, @@ -103,6 +94,7 @@ static struct stateswitch stateswitches[] = { { STATE_PKGLIST, "collection", STATE_COLLECTION, 0 }, { STATE_COLLECTION, "name", STATE_NAME, 1 }, { STATE_COLLECTION, "package", STATE_PACKAGE, 0 }, + { STATE_COLLECTION, "module", STATE_MODULE, 0 }, { STATE_PACKAGE, "filename", STATE_FILENAME, 1 }, { STATE_PACKAGE, "reboot_suggested",STATE_REBOOT, 1 }, { STATE_PACKAGE, "restart_suggested",STATE_RESTART, 1 }, @@ -111,23 +103,16 @@ static struct stateswitch stateswitches[] = { }; struct parsedata { - int depth; - enum state state; - int statedepth; - char *content; - int lcontent; - int acontent; - int docontent; + int ret; Pool *pool; Repo *repo; Repodata *data; - unsigned int datanum; + Id handle; Solvable *solvable; time_t buildtime; Id collhandle; - - struct stateswitch *swtab[NUMSTATES]; - enum state sbtab[NUMSTATES]; + struct solv_xmlparser xmlp; + struct joindata jd; }; /* @@ -153,23 +138,13 @@ datestr2timestamp(const char *date) } /* - * if we have seen a ... - * inside of ... - * - * - * If not, we must insert an empty filename to UPDATE_COLLECTION_FILENAME - * at in order to keep all UPDATE_COLLECTION_* arrays in sync - */ - -/* * create evr (as Id) from 'epoch', 'version' and 'release' attributes */ - static Id makeevr_atts(Pool *pool, struct parsedata *pd, const char **atts) { const char *e, *v, *r, *v2; - char *c; + char *c, *space; int l; e = v = r = 0; @@ -182,7 +157,7 @@ makeevr_atts(Pool *pool, struct parsedata *pd, const char **atts) else if (!strcmp(*atts, "release")) r = atts[1]; } - if (e && !strcmp(e, "0")) + if (e && (!*e || !strcmp(e, "0"))) e = 0; if (v && !e) { @@ -198,12 +173,8 @@ makeevr_atts(Pool *pool, struct parsedata *pd, const char **atts) l += strlen(v); if (r) l += strlen(r) + 1; - if (l > pd->acontent) - { - pd->content = realloc(pd->content, l + 256); - pd->acontent = l + 256; - } - c = pd->content; + + c = space = solv_xmlparser_contentspace(&pd->xmlp, l); if (e) { strcpy(c, e); @@ -222,61 +193,25 @@ makeevr_atts(Pool *pool, struct parsedata *pd, const char **atts) c += strlen(c); } *c = 0; - if (!*pd->content) + if (!*space) return 0; #if 0 - fprintf(stderr, "evr: %s\n", pd->content); + fprintf(stderr, "evr: %s\n", space); #endif - return pool_str2id(pool, pd->content, 1); + return pool_str2id(pool, space, 1); } -static void XMLCALL -startElement(void *userData, const char *name, const char **atts) +static void +startElement(struct solv_xmlparser *xmlp, int state, const char *name, const char **atts) { - struct parsedata *pd = userData; + struct parsedata *pd = xmlp->userdata; Pool *pool = pd->pool; Solvable *solvable = pd->solvable; - struct stateswitch *sw; - /*const char *str; */ - -#if 0 - fprintf(stderr, "start: [%d]%s\n", pd->state, name); -#endif - if (pd->depth != pd->statedepth) - { - pd->depth++; - return; - } - - pd->depth++; - if (!pd->swtab[pd->state]) - return; - for (sw = pd->swtab[pd->state]; sw->from == pd->state; sw++) /* find name in statetable */ - if (!strcmp(sw->ename, name)) - break; - if (sw->from != pd->state) + switch(state) { -#if 0 - fprintf(stderr, "into unknown: %s (from: %d)\n", name, pd->state); - exit( 1 ); -#endif - return; - } - pd->state = sw->to; - pd->docontent = sw->docontent; - pd->statedepth = pd->depth; - pd->lcontent = 0; - *pd->content = 0; - - switch(pd->state) - { - case STATE_START: - break; - case STATE_UPDATES: - break; /* * solvable = pool_id2solvable(pool, repo_add_solvable(pd->repo)); - pd->datanum = pd->solvable - pool->solvables; + pd->handle = pd->solvable - pool->solvables; solvable->vendor = pool_str2id(pool, from, 1); solvable->evr = pool_str2id(pool, version, 1); solvable->arch = ARCH_NOARCH; if (type) - repodata_set_str(pd->data, pd->datanum, SOLVABLE_PATCHCATEGORY, type); + repodata_set_str(pd->data, pd->handle, SOLVABLE_PATCHCATEGORY, type); + if (status) + repodata_set_poolstr(pd->data, pd->handle, UPDATE_STATUS, status); pd->buildtime = (time_t)0; } break; - /* FEDORA-2007-4594 */ - case STATE_ID: - break; - /* imlib-1.9.15-6.fc8 */ - case STATE_TITLE: - break; - /* Fedora 8 */ - case STATE_RELEASE: - break; - /* - */ + case STATE_ISSUED: case STATE_UPDATED: { - const char *date = 0; - for (; *atts; atts += 2) - { - if (!strcmp(*atts, "date")) - date = atts[1]; - } + const char *date = solv_xmlparser_find_attr("date", atts); if (date) { time_t t = datestr2timestamp(date); @@ -336,17 +258,11 @@ startElement(void *userData, const char *name, const char **atts) } } break; - case STATE_REFERENCES: - break; - /* - */ + case STATE_REFERENCE: { const char *href = 0, *id = 0, *title = 0, *type = 0; - Id handle; + Id refhandle; for (; *atts; atts += 2) { if (!strcmp(*atts, "href")) @@ -358,32 +274,19 @@ startElement(void *userData, const char *name, const char **atts) else if (!strcmp(*atts, "type")) type = atts[1]; } - handle = repodata_new_handle(pd->data); + refhandle = repodata_new_handle(pd->data); if (href) - repodata_set_str(pd->data, handle, UPDATE_REFERENCE_HREF, href); + repodata_set_str(pd->data, refhandle, UPDATE_REFERENCE_HREF, href); if (id) - repodata_set_str(pd->data, handle, UPDATE_REFERENCE_ID, id); + repodata_set_str(pd->data, refhandle, UPDATE_REFERENCE_ID, id); if (title) - repodata_set_str(pd->data, handle, UPDATE_REFERENCE_TITLE, title); + repodata_set_str(pd->data, refhandle, UPDATE_REFERENCE_TITLE, title); if (type) - repodata_set_poolstr(pd->data, handle, UPDATE_REFERENCE_TYPE, type); - repodata_add_flexarray(pd->data, pd->datanum, UPDATE_REFERENCE, handle); + repodata_set_poolstr(pd->data, refhandle, UPDATE_REFERENCE_TYPE, type); + repodata_add_flexarray(pd->data, pd->handle, UPDATE_REFERENCE, refhandle); } break; - /* This update ... */ - case STATE_DESCRIPTION: - break; - /* This update ... */ - case STATE_MESSAGE: - break; - case STATE_PKGLIST: - break; - /* Fedora 8 */ - case STATE_NAME: - break; + /* @@ -395,8 +298,7 @@ startElement(void *userData, const char *name, const char **atts) { const char *arch = 0, *name = 0; Id evr = makeevr_atts(pool, pd, atts); /* parse "epoch", "version", "release" */ - Id n, a = 0; - Id rel_id; + Id n, a, id; for (; *atts; atts += 2) { @@ -405,39 +307,66 @@ startElement(void *userData, const char *name, const char **atts) else if (!strcmp(*atts, "name")) name = atts[1]; } - /* generated Id for name */ - n = pool_str2id(pool, name, 1); - rel_id = n; - if (arch) + n = name ? pool_str2id(pool, name, 1) : 0; + a = arch ? pool_str2id(pool, arch, 1) : 0; + + /* generated conflicts for the package */ + if (a && a != ARCH_NOARCH) { - /* generate Id for arch and combine with name */ - a = pool_str2id(pool, arch, 1); - rel_id = pool_rel2id(pool, n, a, REL_ARCH, 1); + id = pool_rel2id(pool, n, a, REL_ARCH, 1); + id = pool_rel2id(pool, id, evr, REL_LT, 1); + solvable->conflicts = repo_addid_dep(pd->repo, solvable->conflicts, id, 0); + id = pool_rel2id(pool, n, ARCH_NOARCH, REL_ARCH, 1); + id = pool_rel2id(pool, id, evr, REL_LT, 1); + solvable->conflicts = repo_addid_dep(pd->repo, solvable->conflicts, id, 0); + } + else + { + id = pool_rel2id(pool, n, evr, REL_LT, 1); + solvable->conflicts = repo_addid_dep(pd->repo, solvable->conflicts, id, 0); } - rel_id = pool_rel2id(pool, rel_id, evr, REL_LT, 1); - - solvable->conflicts = repo_addid_dep(pd->repo, solvable->conflicts, rel_id, 0); /* who needs the collection anyway? */ pd->collhandle = repodata_new_handle(pd->data); repodata_set_id(pd->data, pd->collhandle, UPDATE_COLLECTION_NAME, n); repodata_set_id(pd->data, pd->collhandle, UPDATE_COLLECTION_EVR, evr); - repodata_set_id(pd->data, pd->collhandle, UPDATE_COLLECTION_ARCH, a); + if (a) + repodata_set_id(pd->data, pd->collhandle, UPDATE_COLLECTION_ARCH, a); break; } - /* libntlm-0.4.2-1.fc8.x86_64.rpm */ - /* libntlm-0.4.2-1.fc8.x86_64.rpm */ - case STATE_FILENAME: - break; - /* True */ - case STATE_REBOOT: - break; - /* True */ - case STATE_RESTART: - break; - /* True */ - case STATE_RELOGIN: - break; + case STATE_MODULE: + { + const char *name = 0, *stream = 0, *version = 0, *context = 0, *arch = 0; + Id module_handle; + + for (; *atts; atts += 2) + { + if (!strcmp(*atts, "arch")) + arch = atts[1]; + else if (!strcmp(*atts, "name")) + name = atts[1]; + else if (!strcmp(*atts, "stream")) + stream = atts[1]; + else if (!strcmp(*atts, "version")) + version = atts[1]; + else if (!strcmp(*atts, "context")) + context = atts[1]; + } + module_handle = repodata_new_handle(pd->data); + if (name) + repodata_set_poolstr(pd->data, module_handle, UPDATE_MODULE_NAME, name); + if (stream) + repodata_set_poolstr(pd->data, module_handle, UPDATE_MODULE_STREAM, stream); + if (version) + repodata_set_poolstr(pd->data, module_handle, UPDATE_MODULE_VERSION, version); + if (context) + repodata_set_poolstr(pd->data, module_handle, UPDATE_MODULE_CONTEXT, context); + if (arch) + repodata_set_poolstr(pd->data, module_handle, UPDATE_MODULE_ARCH, arch); + repodata_add_flexarray(pd->data, pd->handle, UPDATE_MODULE, module_handle); + break; + } + default: break; } @@ -445,209 +374,214 @@ startElement(void *userData, const char *name, const char **atts) } -static void XMLCALL -endElement(void *userData, const char *name) +static void +endElement(struct solv_xmlparser *xmlp, int state, char *content) { - struct parsedata *pd = userData; + struct parsedata *pd = xmlp->userdata; Pool *pool = pd->pool; Solvable *s = pd->solvable; Repo *repo = pd->repo; -#if 0 - fprintf(stderr, "end: %s\n", name); -#endif - if (pd->depth != pd->statedepth) - { - pd->depth--; -#if 0 - fprintf(stderr, "back from unknown %d %d %d\n", pd->state, pd->depth, pd->statedepth); -#endif - return; - } - - pd->depth--; - pd->statedepth--; - switch (pd->state) + switch (state) { - case STATE_START: - break; - case STATE_UPDATES: - break; case STATE_UPDATE: s->provides = repo_addid_dep(repo, s->provides, pool_rel2id(pool, s->name, s->evr, REL_EQ, 1), 0); if (pd->buildtime) { - repodata_set_num(pd->data, pd->datanum, SOLVABLE_BUILDTIME, pd->buildtime); + repodata_set_num(pd->data, pd->handle, SOLVABLE_BUILDTIME, pd->buildtime); pd->buildtime = (time_t)0; } break; + case STATE_ID: - s->name = pool_str2id(pool, join2("patch", ":", pd->content), 1); + s->name = pool_str2id(pool, join2(&pd->jd, "patch", ":", content), 1); break; + /* imlib-1.9.15-6.fc8 */ case STATE_TITLE: - while (pd->lcontent > 0 && pd->content[pd->lcontent - 1] == '\n') - pd->content[--pd->lcontent] = 0; - repodata_set_str(pd->data, pd->datanum, SOLVABLE_SUMMARY, pd->content); + /* strip trailing newlines */ + while (pd->xmlp.lcontent > 0 && content[pd->xmlp.lcontent - 1] == '\n') + content[--pd->xmlp.lcontent] = 0; + repodata_set_str(pd->data, pd->handle, SOLVABLE_SUMMARY, content); break; + case STATE_SEVERITY: - repodata_set_poolstr(pd->data, pd->datanum, UPDATE_SEVERITY, pd->content); + repodata_set_poolstr(pd->data, pd->handle, UPDATE_SEVERITY, content); break; + case STATE_RIGHTS: - repodata_set_poolstr(pd->data, pd->datanum, UPDATE_RIGHTS, pd->content); - break; - /* - * Fedora 8 - */ - case STATE_RELEASE: - break; - case STATE_ISSUED: - break; - case STATE_REFERENCES: - break; - case STATE_REFERENCE: + repodata_set_poolstr(pd->data, pd->handle, UPDATE_RIGHTS, content); break; + /* * This update ... */ case STATE_DESCRIPTION: - repodata_set_str(pd->data, pd->datanum, SOLVABLE_DESCRIPTION, pd->content); + repodata_set_str(pd->data, pd->handle, SOLVABLE_DESCRIPTION, content); break; + /* * Warning! ... */ case STATE_MESSAGE: - repodata_set_str(pd->data, pd->datanum, UPDATE_MESSAGE, pd->content); - break; - case STATE_PKGLIST: - break; - case STATE_COLLECTION: - break; - case STATE_NAME: + repodata_set_str(pd->data, pd->handle, UPDATE_MESSAGE, content); break; + case STATE_PACKAGE: - repodata_add_flexarray(pd->data, pd->datanum, UPDATE_COLLECTION, pd->collhandle); + repodata_add_flexarray(pd->data, pd->handle, UPDATE_COLLECTION, pd->collhandle); pd->collhandle = 0; break; + /* libntlm-0.4.2-1.fc8.x86_64.rpm */ /* libntlm-0.4.2-1.fc8.x86_64.rpm */ case STATE_FILENAME: - repodata_set_str(pd->data, pd->collhandle, UPDATE_COLLECTION_FILENAME, pd->content); + repodata_set_str(pd->data, pd->collhandle, UPDATE_COLLECTION_FILENAME, content); break; + /* True */ case STATE_REBOOT: - if (pd->content[0] == 'T' || pd->content[0] == 't'|| pd->content[0] == '1') + if (content[0] == 'T' || content[0] == 't'|| content[0] == '1') { /* FIXME: this is per-package, the global flag should be computed at runtime */ - repodata_set_void(pd->data, pd->datanum, UPDATE_REBOOT); + repodata_set_void(pd->data, pd->handle, UPDATE_REBOOT); repodata_set_void(pd->data, pd->collhandle, UPDATE_REBOOT); } break; + /* True */ case STATE_RESTART: - if (pd->content[0] == 'T' || pd->content[0] == 't'|| pd->content[0] == '1') + if (content[0] == 'T' || content[0] == 't'|| content[0] == '1') { /* FIXME: this is per-package, the global flag should be computed at runtime */ - repodata_set_void(pd->data, pd->datanum, UPDATE_RESTART); + repodata_set_void(pd->data, pd->handle, UPDATE_RESTART); repodata_set_void(pd->data, pd->collhandle, UPDATE_RESTART); } break; + /* True */ case STATE_RELOGIN: - if (pd->content[0] == 'T' || pd->content[0] == 't'|| pd->content[0] == '1') + if (content[0] == 'T' || content[0] == 't'|| content[0] == '1') { /* FIXME: this is per-package, the global flag should be computed at runtime */ - repodata_set_void(pd->data, pd->datanum, UPDATE_RELOGIN); + repodata_set_void(pd->data, pd->handle, UPDATE_RELOGIN); repodata_set_void(pd->data, pd->collhandle, UPDATE_RELOGIN); } break; default: break; } - - pd->state = pd->sbtab[pd->state]; - pd->docontent = 0; } - -static void XMLCALL -characterData(void *userData, const XML_Char *s, int len) -{ - struct parsedata *pd = userData; - int l; - char *c; - - if (!pd->docontent) - { -#if 0 - fprintf(stderr, "Content: [%d]'%.*s'\n", pd->state, len, s); -#endif - return; - } - l = pd->lcontent + len + 1; - if (l > pd->acontent) - { - pd->content = realloc(pd->content, l + 256); - pd->acontent = l + 256; - } - c = pd->content + pd->lcontent; - pd->lcontent += len; - while (len-- > 0) - *c++ = *s++; - *c = 0; -} - - -#define BUFF_SIZE 8192 - int repo_add_updateinfoxml(Repo *repo, FILE *fp, int flags) { Pool *pool = repo->pool; - struct parsedata pd; - char buf[BUFF_SIZE]; - int i, l; - struct stateswitch *sw; Repodata *data; - XML_Parser parser; + struct parsedata pd; data = repo_add_repodata(repo, flags); memset(&pd, 0, sizeof(pd)); - for (i = 0, sw = stateswitches; sw->from != NUMSTATES; i++, sw++) - { - if (!pd.swtab[sw->from]) - pd.swtab[sw->from] = sw; - pd.sbtab[sw->to] = sw->from; - } pd.pool = pool; pd.repo = repo; pd.data = data; + solv_xmlparser_init(&pd.xmlp, stateswitches, &pd, startElement, endElement); + if (solv_xmlparser_parse(&pd.xmlp, fp) != SOLV_XMLPARSER_OK) + pd.ret = pool_error(pool, -1, "repo_updateinfoxml: %s at line %u:%u", pd.xmlp.errstr, pd.xmlp.line, pd.xmlp.column); + solv_xmlparser_free(&pd.xmlp); + join_freemem(&pd.jd); + + if (!(flags & REPO_NO_INTERNALIZE)) + repodata_internalize(data); + return pd.ret; +} + +#ifdef SUSE + +static int +repo_mark_retracted_packages_cmp(const void *ap, const void *bp, void *dp) +{ + Id *a = (Id *)ap; + Id *b = (Id *)bp; + if (a[1] != b[1]) + return a[1] - b[1]; + if (a[2] != b[2]) + return a[2] - b[2]; + if (a[0] != b[0]) + return a[0] - b[0]; + return 0; +} + - pd.content = malloc(256); - pd.acontent = 256; - pd.lcontent = 0; - parser = XML_ParserCreate(NULL); - XML_SetUserData(parser, &pd); - XML_SetElementHandler(parser, startElement, endElement); - XML_SetCharacterDataHandler(parser, characterData); - for (;;) +void +repo_mark_retracted_packages(Repo *repo, Id retractedmarker) +{ + Pool *pool = repo->pool; + int i, p; + Solvable *s; + Id con, *conp; + Id retractedname, retractedevr; + + Queue q; + queue_init(&q); + FOR_REPO_SOLVABLES(repo, p, s) { - l = fread(buf, 1, sizeof(buf), fp); - if (XML_Parse(parser, buf, l, l == 0) == XML_STATUS_ERROR) + const char *status; + s = pool->solvables + p; + if (strncmp(pool_id2str(pool, s->name), "patch:", 6) != 0) { - pool_debug(pool, SOLV_FATAL, "repo_updateinfoxml: %s at line %u:%u\n", XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser), (unsigned int)XML_GetCurrentColumnNumber(parser)); - exit(1); + if (s->arch == ARCH_SRC || s->arch == ARCH_NOSRC) + continue; + queue_push2(&q, p, s->name); + queue_push2(&q, s->evr, s->arch); + continue; + } + status = solvable_lookup_str(s, UPDATE_STATUS); + if (!status || strcmp(status, "retracted") != 0) + continue; + if (!s->conflicts) + continue; + conp = s->repo->idarraydata + s->conflicts; + while ((con = *conp++) != 0) + { + Reldep *rd; + Id name, evr, arch; + if (!ISRELDEP(con)) + continue; + rd = GETRELDEP(pool, con); + if (rd->flags != REL_LT) + continue; + name = rd->name; + evr = rd->evr; + arch = 0; + if (ISRELDEP(name)) + { + rd = GETRELDEP(pool, name); + name = rd->name; + if (rd->flags == REL_ARCH) + arch = rd->evr; + } + queue_push2(&q, 0, name); + queue_push2(&q, evr, arch); } - if (l == 0) - break; } - XML_ParserFree(parser); - free(pd.content); - join_freemem(); - - if (!(flags & REPO_NO_INTERNALIZE)) - repodata_internalize(data); - return 0; + if (q.count) + solv_sort(q.elements, q.count / 4, sizeof(Id) * 4, repo_mark_retracted_packages_cmp, repo->pool); + retractedname = retractedevr = 0; + for (i = 0; i < q.count; i += 4) + { + if (!q.elements[i]) + { + retractedname = q.elements[i + 1]; + retractedevr = q.elements[i + 2]; + } + else if (q.elements[i + 1] == retractedname && q.elements[i + 2] == retractedevr) + { + s = pool->solvables + q.elements[i]; + s->provides = repo_addid_dep(s->repo, s->provides, retractedmarker, 0); + } + } + queue_free(&q); } +#endif