X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=ext%2Frepo_susetags.c;h=dc60aa49ca47bb17eadae1bc80e1e98271370f87;hb=18ebbaf4f619e79231f5ad18a2ab8c135d22ef56;hp=98b85ced27e9a214b5073c620ffdd1f1a80ae1a0;hpb=39250693a91b40f63e7ad5e6c3b86f3b89426393;p=platform%2Fupstream%2Flibsolv.git diff --git a/ext/repo_susetags.c b/ext/repo_susetags.c index 98b85ce..dc60aa4 100644 --- a/ext/repo_susetags.c +++ b/ext/repo_susetags.c @@ -6,8 +6,6 @@ */ #include -#include -#include #include #include #include @@ -18,6 +16,14 @@ #include "chksum.h" #include "tools_util.h" #include "repo_susetags.h" +#ifdef ENABLE_COMPLEX_DEPS +#include "pool_parserpmrichdep.h" +#endif +#include "repodata_diskusage.h" + +#ifdef _WIN32 +#include "strfncs.h" +#endif struct datashare { Id name; @@ -26,6 +32,7 @@ struct datashare { }; struct parsedata { + int ret; Pool *pool; Repo *repo; Repodata *data; @@ -34,8 +41,7 @@ struct parsedata { int last_found_source; struct datashare *share_with; int nshare; - Id (*dirs)[3]; /* dirid, size, nfiles */ - int ndirs; + Queue diskusageq; struct joindata jd; char *language; /* the default language */ Id langcache[ID_NUM_INTERNAL]; /* cache for the default language */ @@ -86,13 +92,24 @@ adddep(Pool *pool, struct parsedata *pd, unsigned int olddeps, char *line, Id ma /* A file dependency. Do not try to parse it */ id = pool_str2id(pool, line + 6, 1); } +#ifdef ENABLE_COMPLEX_DEPS + else if (line[6] == '(') + { + id = pool_parserpmrichdep(pool, line + 6); + if (!id) + { + pd->ret = pool_error(pool, -1, "susetags: line %d: bad dependency: '%s'\n", pd->lineno, line); + return olddeps; + } + } +#endif else { i = split(line + 6, sp, 4); /* name, , evr, ? */ if (i != 1 && i != 3) /* expect either 'name' or 'name' 'evr' */ { - pool_debug(pool, SOLV_FATAL, "susetags: bad dependency line: %d: %s\n", pd->lineno, line); - exit(1); + pd->ret = pool_error(pool, -1, "susetags: line %d: bad dependency: '%s'\n", pd->lineno, line); + return olddeps; } if (kind) id = pool_str2id(pool, join2(&pd->jd, kind, ":", sp[0]), 1); @@ -106,8 +123,13 @@ adddep(Pool *pool, struct parsedata *pd, unsigned int olddeps, char *line, Id ma break; if (flags == 6) { - pool_debug(pool, SOLV_FATAL, "susetags: unknown relation in %d: '%s'\n", pd->lineno, sp[1]); - exit(1); + if (!strcmp(sp[1], "<>")) + flags = 4; + else + { + pd->ret = pool_error(pool, -1, "susetags: line %d: unknown relation: '%s'\n", pd->lineno, sp[1]); + return olddeps; + } } id = pool_rel2id(pool, id, evrid, flags + 1, 1); } @@ -124,67 +146,42 @@ adddep(Pool *pool, struct parsedata *pd, unsigned int olddeps, char *line, Id ma static void add_source(struct parsedata *pd, char *line, Solvable *s, Id handle) { - Repo *repo = s->repo; - Pool *pool = repo->pool; + Pool *pool = s->repo->pool; char *sp[5]; Id name; - Id evr; Id arch; + const char *evr, *sevr; if (split(line, sp, 5) != 4) { - pool_debug(pool, SOLV_FATAL, "susetags: bad source line: %d: %s\n", pd->lineno, line); - exit(1); + pd->ret = pool_error(pool, -1, "susetags: line %d: bad source line '%s'\n", pd->lineno, line); + return; } name = pool_str2id(pool, sp[0], 1); - evr = makeevr(pool, join2(&pd->jd, sp[1], "-", sp[2])); - arch = pool_str2id(pool, sp[3], 1); - /* XXX: could record a dep here, depends on where we want to store the data */ + arch = pool_str2id(pool, sp[3], 1); /* do this before id2str */ + evr = join2(&pd->jd, sp[1], "-", sp[2]); + sevr = pool_id2str(pool, s->evr); + if (sevr) + { + /* strip epoch */ + const char *p; + for (p = sevr; *p >= '0' && *p <= '9'; p++) + ; + if (p != sevr && *p == ':' && p[1]) + sevr = p; + } if (name == s->name) repodata_set_void(pd->data, handle, SOLVABLE_SOURCENAME); else repodata_set_id(pd->data, handle, SOLVABLE_SOURCENAME, name); - if (evr == s->evr) + if (sevr && !strcmp(sevr, evr)) repodata_set_void(pd->data, handle, SOLVABLE_SOURCEEVR); else - repodata_set_id(pd->data, handle, SOLVABLE_SOURCEEVR, evr); + repodata_set_id(pd->data, handle, SOLVABLE_SOURCEEVR, pool_str2id(pool, evr, 1)); repodata_set_constantid(pd->data, handle, SOLVABLE_SOURCEARCH, arch); } -/* - * add_dirline - * add a line with directory information - * - */ - -static void -add_dirline(struct parsedata *pd, char *line) -{ - char *sp[6]; - long filesz; - long filenum; - unsigned dirid; - if (split(line, sp, 6) != 5) - return; - pd->dirs = solv_extend(pd->dirs, pd->ndirs, 1, sizeof(pd->dirs[0]), 31); - filesz = strtol(sp[1], 0, 0); - filesz += strtol(sp[2], 0, 0); - filenum = strtol(sp[3], 0, 0); - filenum += strtol(sp[4], 0, 0); - /* hack: we know that there's room for a / */ - if (*sp[0] != '/') - *--sp[0] = '/'; - dirid = repodata_str2dir(pd->data, sp[0], 1); -#if 0 -fprintf(stderr, "%s -> %d\n", sp[0], dirid); -#endif - pd->dirs[pd->ndirs][0] = dirid; - pd->dirs[pd->ndirs][1] = filesz; - pd->dirs[pd->ndirs][2] = filenum; - pd->ndirs++; -} - static void set_checksum(struct parsedata *pd, Repodata *data, Id handle, Id keyname, char *line) { @@ -192,164 +189,23 @@ set_checksum(struct parsedata *pd, Repodata *data, Id handle, Id keyname, char * Id type; if (split(line, sp, 3) != 2) { - pool_debug(pd->repo->pool, SOLV_FATAL, "susetags: bad checksum line: %d: %s\n", pd->lineno, line); - exit(1); + pd->ret = pool_error(pd->pool, -1, "susetags: line %d: bad checksum line '%s'\n", pd->lineno, line); + return; } type = solv_chksum_str2type(sp[0]); if (!type) { - pool_debug(pd->repo->pool, SOLV_FATAL, "susetags: unknown checksum type: %d: %s\n", pd->lineno, sp[0]); - exit(1); + pd->ret = pool_error(pd->pool, -1, "susetags: line %d: unknown checksum type: '%s'\n", pd->lineno, sp[0]); + return; } if (strlen(sp[1]) != 2 * solv_chksum_len(type)) { - pool_debug(pd->repo->pool, SOLV_FATAL, "susetags: bad checksum length: %d: for %s: %s\n", pd->lineno, sp[0], sp[1]); - exit(1); + pd->ret = pool_error(pd->pool, -1, "susetags: line %d: bad checksum length for type %s: '%s'\n", pd->lineno, sp[0], sp[1]); + return; } repodata_set_checksum(data, handle, keyname, type, sp[1]); } -static void -set_delta_location(Repodata *data, Id handle, int medianr, char *dir, char *file) -{ - Pool *pool = data->repo->pool; - int l = 0; - char *p, *op; - - if (!dir) - { - if ((dir = strrchr(file, '/')) != 0) - { - l = dir - file; - dir = file; - file = dir + l + 1; - if (!l) - l++; - } - } - else - l = strlen(dir); - if (l >= 2 && dir[0] == '.' && dir[1] == '/' && (l == 2 || dir[2] != '/')) - { - dir += 2; - l -= 2; - } - if (l == 1 && dir[0] == '.') - l = 0; - if (dir && l) - repodata_set_id(data, handle, DELTA_LOCATION_DIR, pool_strn2id(pool, dir, l, 1)); - if ((p = strrchr(file, '.')) != 0) - { - *p = 0; - if ((op = strrchr(file, '.')) != 0) - { - *p = '.'; - p = op; - *p = 0; - if (!strcmp(p + 1, "delta.rpm") && (op = strrchr(file, '.')) != 0) - { - *p = '.'; - p = op; - *p = 0; - } - } - repodata_set_id(data, handle, DELTA_LOCATION_SUFFIX, pool_str2id(pool, p + 1, 1)); - } - if ((p = strrchr(file, '-')) != 0) - { - *p = 0; - if ((op = strrchr(file, '-')) != 0) - { - *p = '-'; - p = op; - *p = 0; - } - repodata_set_id(data, handle, DELTA_LOCATION_EVR, pool_str2id(pool, p + 1, 1)); - } - repodata_set_id(data, handle, DELTA_LOCATION_NAME, pool_str2id(pool, file, 1)); -} - - - -/* - * id3_cmp - * compare - * - */ - -static int -id3_cmp(const void *v1, const void *v2, void *dp) -{ - Id *i1 = (Id*)v1; - Id *i2 = (Id*)v2; - return i1[0] - i2[0]; -} - - -/* - * commit_diskusage - * - */ - -static void -commit_diskusage(struct parsedata *pd, Id handle) -{ - unsigned i; - Dirpool *dp = &pd->data->dirpool; - /* Now sort in dirid order. This ensures that parents come before - their children. */ - if (pd->ndirs > 1) - solv_sort(pd->dirs, pd->ndirs, sizeof(pd->dirs[0]), id3_cmp, 0); - /* Substract leaf numbers from all parents to make the numbers - non-cumulative. This must be done post-order (i.e. all leafs - adjusted before parents). We ensure this by starting at the end of - the array moving to the start, hence seeing leafs before parents. */ - for (i = pd->ndirs; i--;) - { - unsigned p = dirpool_parent(dp, pd->dirs[i][0]); - unsigned j = i; - for (; p; p = dirpool_parent(dp, p)) - { - for (; j--;) - if (pd->dirs[j][0] == p) - break; - if (j < pd->ndirs) - { - if (pd->dirs[j][1] < pd->dirs[i][1]) - pd->dirs[j][1] = 0; - else - pd->dirs[j][1] -= pd->dirs[i][1]; - if (pd->dirs[j][2] < pd->dirs[i][2]) - pd->dirs[j][2] = 0; - else - pd->dirs[j][2] -= pd->dirs[i][2]; - } - else - /* Haven't found this parent in the list, look further if - we maybe find the parents parent. */ - j = i; - } - } -#if 0 - char sbuf[1024]; - char *buf = sbuf; - unsigned slen = sizeof(sbuf); - for (i = 0; i < pd->ndirs; i++) - { - dir2str(attr, pd->dirs[i][0], &buf, &slen); - fprintf(stderr, "have dir %d %d %d %s\n", pd->dirs[i][0], pd->dirs[i][1], pd->dirs[i][2], buf); - } - if (buf != sbuf) - free (buf); -#endif - for (i = 0; i < pd->ndirs; i++) - if (pd->dirs[i][1] || pd->dirs[i][2]) - { - repodata_add_dirnumnum(pd->data, handle, SOLVABLE_DISKUSAGE, pd->dirs[i][0], pd->dirs[i][1], pd->dirs[i][2]); - } - pd->ndirs = 0; -} - /* Unfortunately "a"[0] is no constant expression in the C languages, so we need to pass the four characters individually :-/ */ @@ -363,7 +219,7 @@ commit_diskusage(struct parsedata *pd, Id handle) * */ -static inline unsigned +static inline unsigned int tag_from_string(char *cs) { unsigned char *s = (unsigned char *)cs; @@ -395,9 +251,10 @@ tag_from_string(char *cs) */ static void -finish_solvable(struct parsedata *pd, Solvable *s, Id handle, Offset freshens) +finish_solvable(struct parsedata *pd, Solvable *s, Offset freshens) { Pool *pool = pd->repo->pool; + Id handle = s - pool->solvables; if (pd->nfilelist) { @@ -417,23 +274,19 @@ finish_solvable(struct parsedata *pd, Solvable *s, Id handle, Offset freshens) } pd->nfilelist = 0; } - /* A self provide, except for source packages. This is harmless + /* Add self provide, except for source packages. This is harmless to do twice (in case we see the same package twice). */ if (s->name && s->arch != ARCH_SRC && s->arch != ARCH_NOSRC) - s->provides = repo_addid_dep(pd->repo, s->provides, - pool_rel2id(pool, s->name, s->evr, REL_EQ, 1), 0); - /* XXX This uses repo_addid_dep internally, so should also be - harmless to do twice. */ - s->supplements = repo_fix_supplements(pd->repo, s->provides, s->supplements, freshens); - s->conflicts = repo_fix_conflicts(pd->repo, s->conflicts); - if (pd->ndirs) - commit_diskusage(pd, handle); + s->provides = repo_addid_dep(pd->repo, s->provides, pool_rel2id(pool, s->name, s->evr, REL_EQ, 1), 0); + repo_rewrite_suse_deps(s, freshens); + if (pd->diskusageq.count) + repodata_add_diskusage(pd->data, handle, &pd->diskusageq); } static Hashtable -joinhash_init(Repo *repo, Hashmask *hmp) +joinhash_init(Repo *repo, Hashval *hmp) { - Hashmask hm = mkmask(repo->nsolvables); + Hashval hm = mkmask(repo->nsolvables); Hashtable ht = solv_calloc(hm + 1, sizeof(*ht)); Hashval h, hh; Solvable *s; @@ -452,7 +305,7 @@ joinhash_init(Repo *repo, Hashmask *hmp) } static Solvable * -joinhash_lookup(Repo *repo, Hashtable ht, Hashmask hm, Id name, Id evr, Id arch) +joinhash_lookup(Repo *repo, Hashtable ht, Hashval hm, Id name, Id evr, Id arch, Id start) { Hashval h, hh; @@ -463,7 +316,7 @@ joinhash_lookup(Repo *repo, Hashtable ht, Hashmask hm, Id name, Id evr, Id arch) while (ht[h]) { Solvable *s = repo->pool->solvables + ht[h]; - if (s->name == name && s->evr == evr && s->arch == arch) + if (ht[h] >= start && s->name == name && s->evr == evr && s->arch == arch) return s; h = HASHCHAIN_NEXT(h, hh, hm); } @@ -483,21 +336,16 @@ lookup_shared_id(Repodata *data, Id p, Id keyname, Id voidid, int uninternalized if (r) return r; } - if (uninternalized && data->attrs) + if (uninternalized) { - Id *ap = data->attrs[p - data->start]; - if (ap) - { - for (; *ap; ap += 2) - { - if (data->keys[*ap].name != keyname) - continue; - if (data->keys[*ap].type == REPOKEY_TYPE_VOID) - return voidid; - if (data->keys[*ap].type == REPOKEY_TYPE_ID) - return ap[1]; - } - } + KeyValue kv; + Repokey *key = repodata_lookup_kv_uninternalized(data, p, keyname, &kv); + if (!key) + return 0; + if (key->type == REPOKEY_TYPE_VOID) + return voidid; + if (key->type == REPOKEY_TYPE_ID) + return kv.id; } return 0; } @@ -510,6 +358,77 @@ toevr(Pool *pool, struct parsedata *pd, const char *version, const char *release } +static inline void record_share(struct parsedata *pd, Id handle, Id name, Id evr, Id arch) +{ + Repo *repo = pd->repo; + int i = handle - repo->start; + if (i >= pd->nshare) + { + pd->share_with = solv_realloc2(pd->share_with, i + 256, sizeof(*pd->share_with)); + memset(pd->share_with + pd->nshare, 0, (i + 256 - pd->nshare) * sizeof(*pd->share_with)); + pd->nshare = i + 256; + } + pd->share_with[i].name = name; + pd->share_with[i].evr = evr; + pd->share_with[i].arch = arch; +} + +static void process_shares(struct parsedata *pd) +{ + Pool *pool = pd->pool; + Repo *repo = pd->repo; + Repodata *data = pd->data; + int i, last_found; + Map keyidmap; + + map_init(&keyidmap, data->nkeys); + for (i = 1; i < data->nkeys; i++) + { + Id keyname = data->keys[i].name; + if (keyname == SOLVABLE_INSTALLSIZE || keyname == SOLVABLE_DISKUSAGE || keyname == SOLVABLE_FILELIST) + continue; + if (keyname == SOLVABLE_MEDIADIR || keyname == SOLVABLE_MEDIAFILE || keyname == SOLVABLE_MEDIANR) + continue; + if (keyname == SOLVABLE_DOWNLOADSIZE || keyname == SOLVABLE_CHECKSUM) + continue; + if (keyname == SOLVABLE_SOURCENAME || keyname == SOLVABLE_SOURCEARCH || keyname == SOLVABLE_SOURCEEVR) + continue; + if (keyname == SOLVABLE_PKGID || keyname == SOLVABLE_HDRID || keyname == SOLVABLE_LEADSIGID) + continue; + if (keyname == SUSETAGS_SHARE_NAME || keyname == SUSETAGS_SHARE_EVR || keyname == SUSETAGS_SHARE_ARCH) + continue; + MAPSET(&keyidmap, i); + } + last_found = 0; + for (i = 0; i < pd->nshare; i++) + { + unsigned int n, nn; + Solvable *found = 0; + if (!pd->share_with[i].name) + continue; + for (n = repo->start, nn = repo->start + last_found; n < repo->end; n++, nn++) + { + if (nn >= repo->end) + nn = repo->start; + found = pool->solvables + nn; + if (found->repo == repo + && found->name == pd->share_with[i].name + && found->evr == pd->share_with[i].evr + && found->arch == pd->share_with[i].arch) + { + last_found = nn - repo->start; + break; + } + } + if (n != repo->end) + repodata_merge_some_attrs(data, repo->start + i, repo->start + last_found, &keyidmap, 0); + } + pd->share_with = solv_free(pd->share_with); + pd->nshare = 0; + map_free(&keyidmap); +} + + /* * parse susetags * @@ -528,22 +447,23 @@ repo_add_susetags(Repo *repo, FILE *fp, Id defvendor, const char *language, int Solvable *s; Offset freshens; int intag = 0; + int intag_linestart = 0; int cummulate = 0; - int indesc = 0; + int notfound = 0; int indelta = 0; int last_found_pack = 0; - char *sp[5]; + Id first_new_pkg = 0; + char *sp[6]; struct parsedata pd; Repodata *data = 0; Id handle = 0; Hashtable joinhash = 0; - Hashmask joinhashm = 0; + Hashval joinhashm = 0; int createdpkgs = 0; if ((flags & (SUSETAGS_EXTEND|REPO_EXTEND_SOLVABLES)) != 0 && repo->nrepodata) { joinhash = joinhash_init(repo, &joinhashm); - indesc = 1; } data = repo_add_repodata(repo, flags); @@ -557,6 +477,7 @@ repo_add_susetags(Repo *repo, FILE *fp, Id defvendor, const char *language, int pd.data = data; pd.flags = flags; pd.language = language && *language ? solv_strdup(language) : 0; + queue_init(&pd.diskusageq); linep = line; s = 0; @@ -567,7 +488,7 @@ repo_add_susetags(Repo *repo, FILE *fp, Id defvendor, const char *language, int { Repodata *sdata; int i; - + FOR_REPODATAS(repo, i, sdata) { int p; @@ -585,19 +506,11 @@ repo_add_susetags(Repo *repo, FILE *fp, Id defvendor, const char *language, int arch = lookup_shared_id(sdata, p, SUSETAGS_SHARE_ARCH, pool->solvables[p].arch, sdata == data); if (!arch) continue; - if (p - repo->start >= pd.nshare) - { - pd.share_with = solv_realloc2(pd.share_with, p - repo->start + 256, sizeof(*pd.share_with)); - memset(pd.share_with + pd.nshare, 0, (p - repo->start + 256 - pd.nshare) * sizeof(*pd.share_with)); - pd.nshare = p - repo->start + 256; - } - pd.share_with[p - repo->start].name = name; - pd.share_with[p - repo->start].evr = evr; - pd.share_with[p - repo->start].arch = arch; + record_share(&pd, p, name, evr, arch); } } } - + /* * read complete file * @@ -607,10 +520,12 @@ repo_add_susetags(Repo *repo, FILE *fp, Id defvendor, const char *language, int for (;;) { - unsigned tag; - char *olinep; /* old line pointer */ + unsigned int tag; char line_lang[6]; - int keylen = 3; + int keylen; + + if (pd.ret) + break; if (linep - line + 16 > aline) /* (re-)alloc buffer */ { aline = linep - line; @@ -620,84 +535,86 @@ repo_add_susetags(Repo *repo, FILE *fp, Id defvendor, const char *language, int } if (!fgets(linep, aline - (linep - line), fp)) /* read line */ break; - olinep = linep; linep += strlen(linep); if (linep == line || linep[-1] != '\n') continue; pd.lineno++; *--linep = 0; - if (linep == olinep) - continue; if (intag) { - /* check for multi-line value tags (+Key:/-Key:) */ - - int is_end = (linep[-intag - keylen + 1] == '-') - && (linep[-1] == ':') - && (linep == line + 1 + intag + 1 + 1 + 1 + intag + 1 || linep[-intag - keylen] == '\n'); - if (is_end - && strncmp(linep - 1 - intag, line + 1, intag)) - { - pool_debug(pool, SOLV_ERROR, "susetags: Nonmatching multi-line tags: %d: '%s' '%s' %d\n", pd.lineno, linep - 1 - intag, line + 1, intag); - } - if (cummulate && !is_end) + /* in multi-line value tags (+Key:/-Key:), check for end, cummulate */ + int is_end = line[intag_linestart] == '-' && linep[-1] == ':' && linep - line == intag_linestart + intag + 2; + if (is_end && strncmp(linep - 1 - intag, line + 1, intag)) { - *linep++ = '\n'; - continue; + pool_debug(pool, SOLV_ERROR, "susetags: Nonmatching multi-line tags: %d: '%s' '%.*s'\n", pd.lineno, linep - 1 - intag, intag, line + 1); } - if (cummulate && is_end) + if (!is_end) { - linep[-intag - keylen + 1] = 0; - if (linep[-intag - keylen] == '\n') - linep[-intag - keylen] = 0; - linep = line; - intag = 0; + if (cummulate) + { + *linep++ = '\n'; + intag_linestart = linep - line; + continue; + } + intag_linestart = intag + 3; + linep = line + intag_linestart; + if (!*linep) + continue; /* ignore empty lines, bnc#381828 */ } - if (!cummulate && is_end) + else { intag = 0; linep = line; - continue; + if (!cummulate) + continue; + line[intag_linestart] = 0; + if (line[intag_linestart - 1] == '\n') + line[intag_linestart - 1] = 0; /* strip trailing newline */ } - if (!cummulate && !is_end) - linep = line + intag + keylen; } else linep = line; - if (!intag && line[0] == '+' && line[1] && line[1] != ':') /* start of +Key:/-Key: tag */ + /* ignore comments and empty lines */ + if (!*line || *line == '#') + continue; + + /* ignore malformed lines */ + if (!(line[0] && line[1] && line[2] && line[3] && (line[4] == ':' || line[4] == '.'))) + continue; + + if (!intag && line[0] == '+' && line[1] != ':') /* start of +Key:/-Key: tag */ { char *tagend = strchr(line, ':'); - if (!tagend) + if (!tagend || tagend - line > 100) { - pool_debug(pool, SOLV_FATAL, "susetags: bad line: %d: %s\n", pd.lineno, line); - exit(1); + pd.ret = pool_error(pool, -1, "susetags: line %d: bad line '%s'\n", pd.lineno, line); + break; } - intag = tagend - (line + 1); + intag = tagend - (line + 1); /* set to tagsize */ cummulate = 0; - switch (tag_from_string(line)) /* check if accumulation is needed */ + switch (tag_from_string(line)) /* check if accumulation is needed */ { case CTAG('+', 'D', 'e', 's'): case CTAG('+', 'E', 'u', 'l'): case CTAG('+', 'I', 'n', 's'): case CTAG('+', 'D', 'e', 'l'): case CTAG('+', 'A', 'u', 't'): - if (line[4] == ':' || line[4] == '.') - cummulate = 1; + cummulate = 1; break; default: break; } - line[0] = '='; /* handle lines between +Key:/-Key: as =Key: */ - line[intag + keylen - 1] = ' '; - linep = line + intag + keylen; + line[0] = '='; /* handle lines between +Key:/-Key: as =Key: */ + line[intag + 2] = ' '; + intag_linestart = intag + 3; + linep = line + intag_linestart; continue; } - if (*line == '#' || !*line) - continue; - if (! (line[0] && line[1] && line[2] && line[3] && (line[4] == ':' || line[4] == '.'))) - continue; + + /* support language suffix */ + keylen = 3; line_lang[0] = 0; if (line[4] == '.') { @@ -713,140 +630,105 @@ repo_add_susetags(Repo *repo, FILE *fp, Id defvendor, const char *language, int line_lang[langsize] = 0; } } - tag = tag_from_string(line); - if (indelta) - { - /* Example: - =Dlt: subversion 1.6.16 1.3.1 i586 - =Dsq: subversion 1.6.15 4.2 i586 d57b3fc86e7a2f73796e8e35b96fa86212c910 - =Cks: SHA1 14a8410cf741856a5d70d89dab62984dba6a1ca7 - =Loc: 1 subversion-1.6.15_1.6.16-4.2_1.3.1.i586.delta.rpm - =Siz: 81558 - */ - switch (tag) - { - case CTAG('=', 'D', 's', 'q'): - { - Id evr; - if (split(line + 5, sp, 5) != 5) - continue; - repodata_set_id(data, handle, DELTA_SEQ_NAME, pool_str2id(pool, sp[0], 1)); - evr = toevr(pool, &pd, sp[1], sp[2]); - repodata_set_id(data, handle, DELTA_SEQ_EVR, evr); - /* repodata_set_id(data, handle, DELTA_SEQ_ARCH, pool_str2id(pool, sp[3], 1)); */ - repodata_set_str(data, handle, DELTA_SEQ_NUM, sp[4]); - repodata_set_id(data, handle, DELTA_BASE_EVR, evr); - continue; - } - case CTAG('=', 'C', 'k', 's'): - set_checksum(&pd, data, handle, DELTA_CHECKSUM, line + 6); - continue; - case CTAG('=', 'L', 'o', 'c'): - { - int i = split(line + 6, sp, 3); - if (i != 2 && i != 3) - { - pool_debug(pool, SOLV_FATAL, "susetags: bad location line: %d: %s\n", pd.lineno, line); - exit(1); - } - set_delta_location(data, handle, atoi(sp[0]), i == 3 ? sp[2] : 0, sp[1]); - continue; - } - case CTAG('=', 'S', 'i', 'z'): - if (split(line + 6, sp, 3) == 2) - repodata_set_num(data, handle, DELTA_DOWNLOADSIZE, (unsigned int)(atoi(sp[0]) + 1023) / 1024); - continue; - case CTAG('=', 'P', 'k', 'g'): - case CTAG('=', 'P', 'a', 't'): - case CTAG('=', 'D', 'l', 't'): - handle = 0; - indelta = 0; - break; - default: - pool_debug(pool, SOLV_ERROR, "susetags: unknown line: %d: %s\n", pd.lineno, line); - continue; - } - } + tag = tag_from_string(line); - /* - * start of (next) package or pattern or delta - * - * =Pkg: - * (=Pat: ...) - */ - if (tag == CTAG('=', 'D', 'l', 't')) - { + /* handle global tags and tags that start a new section */ + switch (tag) + { + case CTAG('=', 'V', 'e', 'r'): + /* start of a new file */ if (s) - finish_solvable(&pd, s, handle, freshens); + finish_solvable(&pd, s, freshens); s = 0; - pd.kind = 0; - if (split(line + 5, sp, 5) != 4) + handle = 0; + freshens = 0; + indelta = 0; + notfound = 0; + last_found_pack = 0; + if (createdpkgs) { - pool_debug(pool, SOLV_FATAL, "susetags: bad line: %d: %s\n", pd.lineno, line); - exit(1); + solv_free(joinhash); + joinhash = joinhash_init(repo, &joinhashm); + createdpkgs = 0; } - handle = repodata_new_handle(data); - repodata_set_id(data, handle, DELTA_PACKAGE_NAME, pool_str2id(pool, sp[0], 1)); - repodata_set_id(data, handle, DELTA_PACKAGE_EVR, toevr(pool, &pd, sp[1], sp[2])); - repodata_set_id(data, handle, DELTA_PACKAGE_ARCH, pool_str2id(pool, sp[3], 1)); - repodata_add_flexarray(data, SOLVID_META, REPOSITORY_DELTAINFO, handle); - indelta = 1; continue; - } - if (tag == CTAG('=', 'P', 'k', 'g') - || tag == CTAG('=', 'P', 'a', 't')) - { - /* If we have an old solvable, complete it by filling in some - default stuff. */ - if (s) - finish_solvable(&pd, s, handle, freshens); - /* - * define kind - */ + case CTAG('=', 'L', 'a', 'n'): + /* define language of the following material */ + pd.language = solv_free(pd.language); + memset(pd.langcache, 0, sizeof(pd.langcache)); + if (line[6]) + pd.language = solv_strdup(line + 6); + continue; + case CTAG('=', 'P', 'k', 'g'): /* start of a package */ + case CTAG('=', 'P', 'a', 't'): /* start of a pattern */ + case CTAG('=', 'D', 'l', 't'): /* start of a delta */ + /* =Pkg: */ + /* If we have an old solvable, complete it by filling in some default stuff. */ + if (s) + finish_solvable(&pd, s, freshens); + s = 0; + handle = 0; + freshens = 0; + indelta = 0; + notfound = 0; + + /* define kind */ pd.kind = 0; - if (line[3] == 't') + if (tag == CTAG('=', 'P', 'a', 't')) pd.kind = "pattern"; - /* - * parse nevra - */ - + /* parse nevra */ if (split(line + 5, sp, 5) != 4) { - pool_debug(pool, SOLV_FATAL, "susetags: bad line: %d: %s\n", pd.lineno, line); - exit(1); + pd.ret = pool_error(pool, -1, "susetags: line %d: bad line '%s'\n", pd.lineno, line); + break; + } + + if (tag == CTAG('=', 'D', 'l', 't')) + { + /* start new delta */ + handle = repodata_new_handle(data); + repodata_set_id(data, handle, DELTA_PACKAGE_NAME, pool_str2id(pool, sp[0], 1)); + repodata_set_id(data, handle, DELTA_PACKAGE_EVR, toevr(pool, &pd, sp[1], sp[2])); + repodata_set_id(data, handle, DELTA_PACKAGE_ARCH, pool_str2id(pool, sp[3], 1)); + repodata_add_flexarray(data, SOLVID_META, REPOSITORY_DELTAINFO, handle); + indelta = 1; + continue; } - s = 0; - freshens = 0; if (joinhash) { /* data join operation. find solvable matching name/arch/evr and * add data to it */ - Id name, evr, arch; + Id name, arch; /* we don't use the create flag here as a simple pre-check for existance */ if (pd.kind) name = pool_str2id(pool, join2(&pd.jd, pd.kind, ":", sp[0]), 0); else name = pool_str2id(pool, sp[0], 0); - evr = toevr(pool, &pd, sp[1], sp[2]); arch = pool_str2id(pool, sp[3], 0); if (name && arch) { - if (repo->start + last_found_pack + 1 < repo->end) + Id start = (flags & REPO_EXTEND_SOLVABLES) ? 0 : first_new_pkg; + Id evr = toevr(pool, &pd, sp[1], sp[2]); + if (repo->start + last_found_pack + 1 >= start && repo->start + last_found_pack + 1 < repo->end) { s = pool->solvables + repo->start + last_found_pack + 1; if (s->repo != repo || s->name != name || s->evr != evr || s->arch != arch) s = 0; } if (!s) - s = joinhash_lookup(repo, joinhash, joinhashm, name, evr, arch); + s = joinhash_lookup(repo, joinhash, joinhashm, name, evr, arch, start); } + /* do not create new packages in EXTEND_SOLVABLES mode */ if (!s && (flags & REPO_EXTEND_SOLVABLES) != 0) - continue; + { + notfound = 1; + continue; + } /* fallthrough to package creation */ } if (!s) @@ -860,23 +742,78 @@ repo_add_susetags(Repo *repo, FILE *fp, Id defvendor, const char *language, int s->evr = toevr(pool, &pd, sp[1], sp[2]); s->arch = pool_str2id(pool, sp[3], 1); s->vendor = defvendor; + if (!first_new_pkg) + first_new_pkg = s - pool->solvables; createdpkgs = 1; } + handle = s - pool->solvables; last_found_pack = (s - pool->solvables) - repo->start; - if (data) - handle = s - pool->solvables; + continue; + + default: + break; } - /* If we have no current solvable to add to, ignore all further lines - for it. Probably invalid input data in the second set of - solvables. */ - if (indesc >= 2 && !s) - { + /* handle delta tags */ + if (indelta) + { + /* Example: + =Dlt: subversion 1.6.16 1.3.1 i586 + =Dsq: subversion 1.6.15 4.2 i586 d57b3fc86e7a2f73796e8e35b96fa86212c910 + =Cks: SHA1 14a8410cf741856a5d70d89dab62984dba6a1ca7 + =Loc: 1 subversion-1.6.15_1.6.16-4.2_1.3.1.i586.delta.rpm + =Siz: 81558 + */ + switch (tag) + { + case CTAG('=', 'D', 's', 'q'): + { + Id evr; + if (split(line + 5, sp, 5) != 5) + continue; + repodata_set_id(data, handle, DELTA_SEQ_NAME, pool_str2id(pool, sp[0], 1)); + evr = toevr(pool, &pd, sp[1], sp[2]); + repodata_set_id(data, handle, DELTA_SEQ_EVR, evr); + /* repodata_set_id(data, handle, DELTA_SEQ_ARCH, pool_str2id(pool, sp[3], 1)); */ + repodata_set_str(data, handle, DELTA_SEQ_NUM, sp[4]); + repodata_set_id(data, handle, DELTA_BASE_EVR, evr); + continue; + } + case CTAG('=', 'C', 'k', 's'): + set_checksum(&pd, data, handle, DELTA_CHECKSUM, line + 6); + continue; + case CTAG('=', 'L', 'o', 'c'): + { + int i = split(line + 6, sp, 3); + if (i != 2 && i != 3) + { + pd.ret = pool_error(pool, -1, "susetags: line %d: bad location line '%s'\n", pd.lineno, line); + continue; + } + repodata_set_deltalocation(data, handle, atoi(sp[0]), i == 3 ? sp[2] : 0, sp[1]); + continue; + } + case CTAG('=', 'S', 'i', 'z'): + if (split(line + 6, sp, 3) == 2) + repodata_set_num(data, handle, DELTA_DOWNLOADSIZE, strtoull(sp[0], 0, 10)); + continue; + default: + pool_debug(pool, SOLV_WARN, "susetags: unknown line: %d: %s\n", pd.lineno, line); + continue; + } + } + + /* we need a solvable for all other tags */ + if (!s) + { + if (notfound) + continue; /* did not find the solvable to extend */ #if 0 - pool_debug(pool, SOLV_ERROR, "susetags: huh %d: %s?\n", pd.lineno, line); + pool_debug(pool, SOLV_WARN, "susetags: stray line: %d: %s\n", pd.lineno, line); #endif continue; } + switch (tag) { case CTAG('=', 'P', 'r', 'v'): /* provides */ @@ -907,11 +844,9 @@ repo_add_susetags(Repo *repo, FILE *fp, Id defvendor, const char *language, int continue; case CTAG('=', 'P', 'r', 'q'): /* pre-requires / packages required */ if (pd.kind) - { - s->requires = adddep(pool, &pd, s->requires, line, 0, 0); /* patterns: a required package */ - } + s->requires = adddep(pool, &pd, s->requires, line, 0, 0); /* pattern: package requires */ else - s->requires = adddep(pool, &pd, s->requires, line, SOLVABLE_PREREQMARKER, 0); /* package: pre-requires */ + s->requires = adddep(pool, &pd, s->requires, line, SOLVABLE_PREREQMARKER, 0); /* pre-requires */ continue; case CTAG('=', 'O', 'b', 's'): /* obsoletes */ s->obsoletes = adddep(pool, &pd, s->obsoletes, line, 0, pd.kind); @@ -955,17 +890,6 @@ repo_add_susetags(Repo *repo, FILE *fp, Id defvendor, const char *language, int case CTAG('=', 'P', 'e', 'n'): /* pattern: package enhances */ s->enhances = adddep(pool, &pd, s->enhances, line, 0, 0); continue; - case CTAG('=', 'V', 'e', 'r'): /* - version - */ - last_found_pack = 0; - handle = 0; - indesc++; - if (createdpkgs) - { - solv_free(joinhash); - joinhash = joinhash_init(repo, &joinhashm); - createdpkgs = 0; - } - continue; case CTAG('=', 'V', 'n', 'd'): /* vendor */ s->vendor = pool_str2id(pool, line + 6, 1); continue; @@ -982,8 +906,8 @@ repo_add_susetags(Repo *repo, FILE *fp, Id defvendor, const char *language, int int i = split(line + 6, sp, 3); if (i != 2 && i != 3) { - pool_debug(pool, SOLV_FATAL, "susetags: bad location line: %d: %s\n", pd.lineno, line); - exit(1); + pd.ret = pool_error(pool, -1, "susetags: line %d: bad location line '%s'\n", pd.lineno, line); + continue; } repodata_set_location(data, handle, atoi(sp[0]), i == 3 ? sp[2] : pool_id2str(pool, s->arch), sp[1]); } @@ -994,8 +918,8 @@ repo_add_susetags(Repo *repo, FILE *fp, Id defvendor, const char *language, int case CTAG('=', 'S', 'i', 'z'): if (split(line + 6, sp, 3) == 2) { - repodata_set_num(data, handle, SOLVABLE_DOWNLOADSIZE, (unsigned int)(atoi(sp[0]) + 1023) / 1024); - repodata_set_num(data, handle, SOLVABLE_INSTALLSIZE, (unsigned int)(atoi(sp[1]) + 1023) / 1024); + repodata_set_num(data, handle, SOLVABLE_DOWNLOADSIZE, strtoull(sp[0], 0, 10)); + repodata_set_num(data, handle, SOLVABLE_INSTALLSIZE, strtoull(sp[1], 0, 10)); } continue; case CTAG('=', 'T', 'i', 'm'): @@ -1029,32 +953,24 @@ repo_add_susetags(Repo *repo, FILE *fp, Id defvendor, const char *language, int case CTAG('=', 'V', 'i', 's'): { /* Accept numbers and textual bools. */ - unsigned k; + int k; k = atoi(line + 6); if (k || !strcasecmp(line + 6, "true")) repodata_set_void(data, handle, SOLVABLE_ISVISIBLE); + continue; } - continue; case CTAG('=', 'S', 'h', 'r'): { Id name, evr, arch; if (split(line + 6, sp, 5) != 4) { - pool_debug(pool, SOLV_FATAL, "susetags: bad =Shr line: %s\n", line + 6); - exit(1); + pd.ret = pool_error(pool, -1, "susetags: line %d: bad =Shr line '%s'\n", pd.lineno, line); + continue; } name = pool_str2id(pool, sp[0], 1); evr = toevr(pool, &pd, sp[1], sp[2]); arch = pool_str2id(pool, sp[3], 1); - if (last_found_pack >= pd.nshare) - { - pd.share_with = solv_realloc2(pd.share_with, last_found_pack + 256, sizeof(*pd.share_with)); - memset(pd.share_with + pd.nshare, 0, (last_found_pack + 256 - pd.nshare) * sizeof(*pd.share_with)); - pd.nshare = last_found_pack + 256; - } - pd.share_with[last_found_pack].name = name; - pd.share_with[last_found_pack].evr = evr; - pd.share_with[last_found_pack].arch = arch; + record_share(&pd, handle, name, evr, arch); if ((flags & SUSETAGS_RECORD_SHARES) != 0) { if (s->name == name) @@ -1073,8 +989,22 @@ repo_add_susetags(Repo *repo, FILE *fp, Id defvendor, const char *language, int continue; } case CTAG('=', 'D', 'i', 'r'): - add_dirline(&pd, line + 6); - continue; + if (split(line + 6, sp, 6) == 5) + { + long filesz, filenum; + Id did; + + filesz = strtol(sp[1], 0, 0); + filesz += strtol(sp[2], 0, 0); + filenum = strtol(sp[3], 0, 0); + filenum += strtol(sp[4], 0, 0); + if (*sp[0] != '/') + *--sp[0] = '/'; /* hack: we know that there's room for a / */ + did = repodata_str2dir(data, sp[0], 1); + queue_push(&pd.diskusageq, did); + queue_push2(&pd.diskusageq, (Id)filesz, (Id)filenum); + } + break; case CTAG('=', 'C', 'a', 't'): repodata_set_poolstr(data, handle, langtag(&pd, SOLVABLE_CATEGORY, line_lang), line + 3 + keylen); break; @@ -1095,36 +1025,25 @@ repo_add_susetags(Repo *repo, FILE *fp, Id defvendor, const char *language, int case CTAG('=', 'C', 'k', 's'): set_checksum(&pd, data, handle, SOLVABLE_CHECKSUM, line + 6); break; - case CTAG('=', 'L', 'a', 'n'): - pd.language = solv_free(pd.language); - memset(pd.langcache, 0, sizeof(pd.langcache)); - if (line[6]) - pd.language = solv_strdup(line + 6); - break; case CTAG('=', 'F', 'l', 's'): { - char *p = strrchr(line + 6, '/'); + char *p, *file = line + 6; Id did; - /* strip trailing slash */ - if (p && p != line + 6 && !p[1]) + + if (*file != '/') + *--file = '/'; /* hack: we know there is room */ + p = strrchr(file, '/'); + /* strip trailing slashes */ + while (p != file && !p[1]) { *p = 0; - p = strrchr(line + 6, '/'); - } - if (p) - { - *p++ = 0; - did = repodata_str2dir(data, line + 6, 1); + p = strrchr(file, '/'); } - else - { - p = line + 6; - did = 0; - } - if (!did) - did = repodata_str2dir(data, "/", 1); + *p++ = 0; + did = repodata_str2dir(data, *file ? file : "/", 1); repodata_add_dirstr(data, handle, SOLVABLE_FILELIST, did, p); + line[5] = ' '; break; } case CTAG('=', 'H', 'd', 'r'): @@ -1138,81 +1057,47 @@ repo_add_susetags(Repo *repo, FILE *fp, Id defvendor, const char *language, int } break; - case CTAG('=', 'P', 'a', 't'): - case CTAG('=', 'P', 'k', 'g'): - break; - default: - pool_debug(pool, SOLV_ERROR, "susetags: unknown line: %d: %s\n", pd.lineno, line); +#if 0 + pool_debug(pool, SOLV_WARN, "susetags: unknown line: %d: %s\n", pd.lineno, line); +#endif break; } - - } /* for(;;) */ + } if (s) - finish_solvable(&pd, s, handle, freshens); + finish_solvable(&pd, s, freshens); solv_free(pd.filelist); - /* Shared attributes - * (e.g. multiple binaries built from same source) - */ + /* process shared attributes (e.g. multiple binaries built from same source) */ if (pd.nshare) - { - int i, last_found; - Map keyidmap; + process_shares(&pd); - map_init(&keyidmap, data->nkeys); - for (i = 1; i < data->nkeys; i++) + solv_free(joinhash); + repodata_free_dircache(data); + + if ((flags & REPO_EXTEND_SOLVABLES) != 0) + { + /* is this a filelist extension? */ + if (repodata_has_keyname(data, SOLVABLE_FILELIST)) + repodata_set_filelisttype(data, REPODATA_FILELIST_EXTENSION); + } + else + { + /* is this a primary with a filtered filelist? */ + if (data->end > data->start) { - Id keyname = data->keys[i].name; - if (keyname == SOLVABLE_INSTALLSIZE || keyname == SOLVABLE_DISKUSAGE || keyname == SOLVABLE_FILELIST) - continue; - if (keyname == SOLVABLE_MEDIADIR || keyname == SOLVABLE_MEDIAFILE || keyname == SOLVABLE_MEDIANR) - continue; - if (keyname == SOLVABLE_DOWNLOADSIZE || keyname == SOLVABLE_CHECKSUM) - continue; - if (keyname == SOLVABLE_SOURCENAME || keyname == SOLVABLE_SOURCEARCH || keyname == SOLVABLE_SOURCEEVR) - continue; - if (keyname == SOLVABLE_PKGID || keyname == SOLVABLE_HDRID || keyname == SOLVABLE_LEADSIGID) - continue; - if (keyname == SUSETAGS_SHARE_NAME || keyname == SUSETAGS_SHARE_EVR || keyname == SUSETAGS_SHARE_ARCH) - continue; - MAPSET(&keyidmap, i); + repodata_set_filelisttype(data, REPODATA_FILELIST_FILTERED); + repodata_set_void(data, SOLVID_META, REPOSITORY_FILTEREDFILELIST); } - last_found = 0; - for (i = 0; i < pd.nshare; i++) - { - unsigned n, nn; - Solvable *found = 0; - if (!pd.share_with[i].name) - continue; - for (n = repo->start, nn = repo->start + last_found; n < repo->end; n++, nn++) - { - if (nn >= repo->end) - nn = repo->start; - found = pool->solvables + nn; - if (found->repo == repo - && found->name == pd.share_with[i].name - && found->evr == pd.share_with[i].evr - && found->arch == pd.share_with[i].arch) - { - last_found = nn - repo->start; - break; - } - } - if (n != repo->end) - repodata_merge_some_attrs(data, repo->start + i, repo->start + last_found, &keyidmap, 0); - } - free(pd.share_with); - map_free(&keyidmap); - } + } - solv_free(joinhash); if (!(flags & REPO_NO_INTERNALIZE)) repodata_internalize(data); solv_free(pd.language); solv_free(line); join_freemem(&pd.jd); - return 0; + queue_free(&pd.diskusageq); + return pd.ret; }