Author: mlschroe Date: Mon Feb 18 18:57:59 2008 New Revision: 8786 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8786&view=rev Log: - strip trailing slashes from splitprovides so that file provides will match - use solvables:filemarker instead of solvable:prereqmarker for provides - split of read_rel_idarray to simplify things Modified: trunk/sat-solver/src/repo.c trunk/sat-solver/src/repo_solv.c Modified: trunk/sat-solver/src/repo.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo.c?rev=8786&r1=8785&r2=8786&view=diff ============================================================================== --- trunk/sat-solver/src/repo.c (original) +++ trunk/sat-solver/src/repo.c Mon Feb 18 18:57:59 2008 @@ -388,6 +388,10 @@ p = buf + (p - dep); *p++ = 0; idp = str2id(pool, buf, 1); + /* strip trailing slashes */ + i = strlen(p); + while (i > 1 && p[i - 1] == '/') + p[--i] = 0; id = str2id(pool, p, 1); id = rel2id(pool, idp, id, REL_WITH, 1); id = rel2id(pool, NAMESPACE_SPLITPROVIDES, id, REL_NAMESPACE, 1); Modified: trunk/sat-solver/src/repo_solv.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo_solv.c?rev=8786&r1=8785&r2=8786&view=diff ============================================================================== --- trunk/sat-solver/src/repo_solv.c (original) +++ trunk/sat-solver/src/repo_solv.c Mon Feb 18 18:57:59 2008 @@ -135,7 +135,7 @@ */ static Id * -read_idarray(Repodata *data, Id max, Id *map, Id *store, Id *end, int relative) +read_rel_idarray(Repodata *data, Id max, Id *map, Id *store, Id *end, Id marker) { unsigned int x = 0; int c; @@ -152,59 +152,110 @@ data->error = SOLV_ERROR_EOF; return 0; } - if ((c & 128) == 0) + if ((c & 128) != 0) { - x = (x << 6) | (c & 63); - if (relative) + x = (x << 7) ^ c ^ 128; + continue; + } + x = (x << 6) | (c & 63); + if (x == 0 && c == 0x40) + { + /* marker hack */ + if (store == end) { - if (x == 0 && c == 0x40) - { - /* prereq hack */ - if (store == end) - { - pool_debug(mypool, SAT_ERROR, "read_idarray: array overflow\n"); - data->error = SOLV_ERROR_OVERFLOW; - return 0; - } - *store++ = SOLVABLE_PREREQMARKER; - old = 0; - x = 0; - continue; - } - x = (x - 1) + old; - old = x; + pool_debug(mypool, SAT_ERROR, "read_rel_idarray: array overflow\n"); + data->error = SOLV_ERROR_OVERFLOW; + return 0; } - if (max && x >= max) + *store++ = marker; /* do not map! */ + old = 0; + x = 0; + continue; + } + x = (x - 1) + old; + old = x; + if (max && x >= max) + { + pool_debug(mypool, SAT_ERROR, "read_rel_idarray: id too large (%u/%u)\n", x, max); + data->error = SOLV_ERROR_ID_RANGE; + return 0; + } + if (map) + x = map[x]; + if (store == end) + { + pool_debug(mypool, SAT_ERROR, "read_rel_idarray: array overflow\n"); + return 0; + } + *store++ = x; + if ((c & 64) == 0) + { + if (x == 0) /* already have trailing zero? */ + return store; + if (store == end) { - pool_debug(mypool, SAT_ERROR, "read_idarray: id too large (%u/%u)\n", x, max); - data->error = SOLV_ERROR_ID_RANGE; + pool_debug(mypool, SAT_ERROR, "read_rel_idarray: array overflow\n"); + data->error = SOLV_ERROR_OVERFLOW; return 0; } - if (map) - x = map[x]; + *store++ = 0; + return store; + } + x = 0; + } +} + +static Id * +read_idarray(Repodata *data, Id max, Id *map, Id *store, Id *end) +{ + unsigned int x = 0; + int c; + + if (data->error) + return 0; + for (;;) + { + c = getc(data->fp); + if (c == EOF) + { + pool_debug(mypool, SAT_ERROR, "unexpected EOF\n"); + data->error = SOLV_ERROR_EOF; + return 0; + } + if ((c & 128) != 0) + { + x = (x << 7) ^ c ^ 128; + continue; + } + x = (x << 6) | (c & 63); + if (max && x >= max) + { + pool_debug(mypool, SAT_ERROR, "read_idarray: id too large (%u/%u)\n", x, max); + data->error = SOLV_ERROR_ID_RANGE; + return 0; + } + if (map) + x = map[x]; + if (store == end) + { + pool_debug(mypool, SAT_ERROR, "read_idarray: array overflow\n"); + return 0; + } + *store++ = x; + if ((c & 64) == 0) + { + if (x == 0) /* already have trailing zero? */ + return store; if (store == end) { pool_debug(mypool, SAT_ERROR, "read_idarray: array overflow\n"); + data->error = SOLV_ERROR_OVERFLOW; return 0; } - *store++ = x; - if ((c & 64) == 0) - { - if (x == 0) /* already have trailing zero? */ - return store; - if (store == end) - { - pool_debug(mypool, SAT_ERROR, "read_idarray: array overflow\n"); - data->error = SOLV_ERROR_OVERFLOW; - return 0; - } - *store++ = 0; - return store; - } - x = 0; - continue; + *store++ = 0; + return store; } - x = (x << 7) ^ c ^ 128; + x = 0; } } @@ -370,7 +421,7 @@ } /* read_idarray writes a terminating 0, that's why the + 1 */ ida = sat_calloc(keys[key].size + 1, sizeof(Id)); - ide = read_idarray(maindata, 0, 0, ida, ida + keys[key].size + 1, 0); + ide = read_idarray(maindata, 0, 0, ida, ida + keys[key].size + 1); n = ide - ida - 1; if (n & 1) { @@ -976,7 +1027,7 @@ for (i = 1; i < numschemata; i++) { schemata[i] = schemadatap - schemadata; - schemadatap = read_idarray(&data, numid, 0, schemadatap, schemadataend, 0); + schemadatap = read_idarray(&data, numid, 0, schemadatap, schemadataend); #if 0 Id *sp = schemadata + schemata[i]; fprintf (stderr, "schema %d:", i); @@ -1174,32 +1225,7 @@ { if (idmap) { - Id old = 0, rel = keys[key].type == TYPE_REL_IDARRAY ? SOLVABLE_PREREQMARKER : 0; - do - { - did = read_id(&data, 0); - h = did & 0x40; - did = (did & 0x3f) | ((did >> 1) & ~0x3f); - if (rel) - { - if (did == 0) - { - did = rel; - old = 0; - } - else - { - did += old; - old = did; - } - } - if (did >= numid + numrel) - abort(); - did = idmap[did]; - did = ((did & ~0x3f) << 1) | h; - incore_add_id(&data, did); - } - while (h); + abort(); /* implement me! */ } else { @@ -1217,7 +1243,14 @@ break; } ido = idarraydatap - repo->idarraydata; - idarraydatap = read_idarray(&data, numid + numrel, idmap, idarraydatap, idarraydataend, keys[key].type == TYPE_REL_IDARRAY); + if (keys[key].type == TYPE_IDARRAY) + idarraydatap = read_idarray(&data, numid + numrel, idmap, idarraydatap, idarraydataend); + else if (id == SOLVABLE_REQUIRES) + idarraydatap = read_rel_idarray(&data, numid + numrel, idmap, idarraydatap, idarraydataend, SOLVABLE_PREREQMARKER); + else if (id == SOLVABLE_PROVIDES) + idarraydatap = read_rel_idarray(&data, numid + numrel, idmap, idarraydatap, idarraydataend, SOLVABLE_FILEMARKER); + else + idarraydatap = read_rel_idarray(&data, numid + numrel, idmap, idarraydatap, idarraydataend, 0); if (id == SOLVABLE_PROVIDES) s->provides = ido; else if (id == SOLVABLE_OBSOLETES) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org