#include "chksum.h"
#include "repo_content.h"
#define DISABLE_SPLIT
+#define DISABLE_JOIN2
#include "tools_util.h"
/* split off a word, return null terminated pointer to it.
if (l > pd->tmpl)
{
pd->tmpl = l + 256;
- pd->tmp = sat_realloc(pd->tmp, pd->tmpl);
+ pd->tmp = solv_realloc(pd->tmp, pd->tmpl);
}
p = pd->tmp;
if (s1)
dependencies sometimes. */
if (!strncmp (name, "package:", 8))
name += 8;
- id = str2id(pool, name, 1);
+ id = pool_str2id(pool, name, 1);
if (*line == '<' || *line == '>' || *line == '=') /* rel follows */
{
char *rel = splitword(&line);
if (!rel || !evr)
{
- pool_debug(pool, SAT_FATAL, "repo_content: bad relation '%s %s'\n", name, rel);
+ pool_debug(pool, SOLV_FATAL, "repo_content: bad relation '%s %s'\n", name, rel);
continue;
}
for (flags = 0; flags < 6; flags++)
break;
if (flags == 6)
{
- pool_debug(pool, SAT_FATAL, "repo_content: unknown relation '%s'\n", rel);
+ pool_debug(pool, SOLV_FATAL, "repo_content: unknown relation '%s'\n", rel);
continue;
}
- id = rel2id(pool, id, str2id(pool, evr, 1), flags + 1, 1);
+ id = pool_rel2id(pool, id, pool_str2id(pool, evr, 1), flags + 1, 1);
}
olddeps = repo_addid_dep(pd->repo, olddeps, id, marker);
}
*
*/
-void
+int
repo_add_content(Repo *repo, FILE *fp, int flags)
{
Pool *pool = repo->pool;
char *defvendor = 0;
int i = 0;
+ int res = 0;
/* architectures
we use the first architecture in BASEARCHS or noarch
Id *otherarchs = 0;
memset(&pd, 0, sizeof(pd));
- line = sat_malloc(1024);
+ line = solv_malloc(1024);
aline = 1024;
pd.repo = repo;
if (linep - line + 16 > aline)
{
aline = linep - line;
- line = sat_realloc(line, aline + 512);
+ line = solv_realloc(line, aline + 512);
linep = line + aline;
aline += 512;
}
if (istag ("CONTENTSTYLE"))
{
if (contentstyle)
- pool_debug(pool, SAT_ERROR, "repo_content: 'CONTENTSTYLE' must be first line of 'content'\n");
+ pool_debug(pool, SOLV_ERROR, "repo_content: 'CONTENTSTYLE' must be first line of 'content'\n");
contentstyle = atoi(value);
continue;
}
if (descrdir)
free(descrdir);
else
- repo_set_str(repo, SOLVID_META, SUSETAGS_DESCRDIR, value);
+ repodata_set_str(data, SOLVID_META, SUSETAGS_DESCRDIR, value);
if (s)
- repo_set_str(repo, s - pool->solvables, SUSETAGS_DESCRDIR, value);
- descrdir = strdup(value);
+ repodata_set_str(data, s - pool->solvables, SUSETAGS_DESCRDIR, value);
+ descrdir = solv_strdup(value);
continue;
}
if (istag ("DATADIR"))
if (datadir)
free(datadir);
else
- repo_set_str(repo, SOLVID_META, SUSETAGS_DATADIR, value);
+ repodata_set_str(data, SOLVID_META, SUSETAGS_DATADIR, value);
if (s)
- repo_set_str(repo, s - pool->solvables, SUSETAGS_DATADIR, value);
- datadir = strdup(value);
+ repodata_set_str(data, s - pool->solvables, SUSETAGS_DATADIR, value);
+ datadir = solv_strdup(value);
continue;
}
if (istag ("VENDOR"))
if (defvendor)
free(defvendor);
else
- repo_set_poolstr(repo, SOLVID_META, SUSETAGS_DEFAULTVENDOR, value);
+ repodata_set_poolstr(data, SOLVID_META, SUSETAGS_DEFAULTVENDOR, value);
if (s)
- s->vendor = str2id(pool, value, 1);
- defvendor = strdup(value);
+ s->vendor = pool_str2id(pool, value, 1);
+ defvendor = solv_strdup(value);
continue;
}
continue;
if (!*value)
continue;
- type = sat_chksum_str2type(checksumtype);
+ type = solv_chksum_str2type(checksumtype);
if (!type)
{
- fprintf(stderr, "Unknown checksum type: %s: %s\n", value, checksumtype);
+ pool_error(pool, -1, "%s: unknown checksum type '%s'", value, checksumtype);
+ res = 1;
continue;
}
- l = sat_chksum_len(type);
+ l = solv_chksum_len(type);
if (strlen(checksum) != 2 * l)
{
- fprintf(stderr, "Invalid checksum length: %s: for %s\n", value, checksum);
+ pool_error(pool, -1, "%s: invalid checksum length for %s", value, checksumtype);
+ res = 1;
continue;
}
fh = repodata_new_handle(data);
{
/* this solvable was created without seeing a
PRODUCT entry, just set the name and continue */
- s->name = str2id(pool, join(&pd, "product", ":", value), 1);
+ s->name = pool_str2id(pool, join(&pd, "product", ":", value), 1);
continue;
}
if (s)
if (!s->evr)
s->evr = ID_EMPTY;
if (s->name && s->arch != ARCH_SRC && s->arch != ARCH_NOSRC)
- s->provides = repo_addid_dep(repo, s->provides, rel2id(pool, s->name, s->evr, REL_EQ, 1), 0);
+ s->provides = repo_addid_dep(repo, s->provides, pool_rel2id(pool, s->name, s->evr, REL_EQ, 1), 0);
if (code10)
s->supplements = repo_fix_supplements(repo, s->provides, s->supplements, 0);
}
s = pool_id2solvable(pool, repo_add_solvable(repo));
repodata_extend(data, s - pool->solvables);
handle = s - pool->solvables;
- s->name = str2id(pool, join(&pd, "product", ":", value), 1);
+ s->name = pool_str2id(pool, join(&pd, "product", ":", value), 1);
if (datadir)
- repo_set_str(repo, s - pool->solvables, SUSETAGS_DATADIR, datadir);
+ repodata_set_str(data, s - pool->solvables, SUSETAGS_DATADIR, datadir);
if (descrdir)
- repo_set_str(repo, s - pool->solvables, SUSETAGS_DESCRDIR, descrdir);
+ repodata_set_str(data, s - pool->solvables, SUSETAGS_DESCRDIR, descrdir);
if (defvendor)
- s->vendor = str2id(pool, defvendor, 1);
+ s->vendor = pool_str2id(pool, defvendor, 1);
continue;
}
}
if (istag ("VERSION"))
- pd.tmpvers = strdup(value);
+ pd.tmpvers = solv_strdup(value);
else if (istag ("RELEASE"))
- pd.tmprel = strdup(value);
+ pd.tmprel = solv_strdup(value);
else if (code11 && istag ("DISTRIBUTION"))
- repo_set_str(repo, s - pool->solvables, SOLVABLE_DISTRIBUTION, value);
+ repodata_set_poolstr(data, s - pool->solvables, SOLVABLE_DISTRIBUTION, value);
else if (istag ("UPDATEURLS"))
- add_multiple_urls(data, handle, value, str2id(pool, "update", 1));
+ add_multiple_urls(data, handle, value, pool_str2id(pool, "update", 1));
else if (istag ("EXTRAURLS"))
- add_multiple_urls(data, handle, value, str2id(pool, "extra", 1));
+ add_multiple_urls(data, handle, value, pool_str2id(pool, "extra", 1));
else if (istag ("OPTIONALURLS"))
- add_multiple_urls(data, handle, value, str2id(pool, "optional", 1));
+ add_multiple_urls(data, handle, value, pool_str2id(pool, "optional", 1));
else if (istag ("RELNOTESURL"))
- add_multiple_urls(data, handle, value, str2id(pool, "releasenotes", 1));
+ add_multiple_urls(data, handle, value, pool_str2id(pool, "releasenotes", 1));
else if (istag ("SHORTLABEL"))
- repo_set_str(repo, s - pool->solvables, PRODUCT_SHORTLABEL, value);
+ repodata_set_str(data, s - pool->solvables, PRODUCT_SHORTLABEL, value);
else if (istag ("LABEL")) /* LABEL is the products SUMMARY. */
- repo_set_str(repo, s - pool->solvables, SOLVABLE_SUMMARY, value);
+ repodata_set_str(data, s - pool->solvables, SOLVABLE_SUMMARY, value);
else if (!strncmp (key, "LABEL.", 6))
- repo_set_str(repo, s - pool->solvables, pool_id2langid(pool, SOLVABLE_SUMMARY, key + 6, 1), value);
+ repodata_set_str(data, s - pool->solvables, pool_id2langid(pool, SOLVABLE_SUMMARY, key + 6, 1), value);
else if (istag ("FLAGS"))
add_multiple_strings(data, handle, PRODUCT_FLAGS, value);
else if (istag ("VENDOR")) /* actually already handled above */
- s->vendor = str2id(pool, value, 1);
+ s->vendor = pool_str2id(pool, value, 1);
else if (istag ("BASEARCHS"))
{
char *arch;
if ((arch = splitword(&value)) != 0)
{
- s->arch = str2id(pool, arch, 1);
+ s->arch = pool_str2id(pool, arch, 1);
while ((arch = splitword(&value)) != 0)
{
- otherarchs = sat_extend(otherarchs, numotherarchs, 1, sizeof(Id), 7);
- otherarchs[numotherarchs++] = str2id(pool, arch, 1);
+ otherarchs = solv_extend(otherarchs, numotherarchs, 1, sizeof(Id), 7);
+ otherarchs[numotherarchs++] = pool_str2id(pool, arch, 1);
}
}
}
if (code10 && istag ("DISTPRODUCT"))
/* DISTPRODUCT is for registration and Yast, not for the solver. */
- repo_set_str(repo, s - pool->solvables, PRODUCT_DISTPRODUCT, value);
+ repodata_set_str(data, s - pool->solvables, PRODUCT_DISTPRODUCT, value);
else if (code10 && istag ("DISTVERSION"))
/* DISTVERSION is for registration and Yast, not for the solver. */
- repo_set_str(repo, s - pool->solvables, PRODUCT_DISTVERSION, value);
+ repodata_set_str(data, s - pool->solvables, PRODUCT_DISTVERSION, value);
else if (code10 && istag ("ARCH"))
/* Theoretically we want to have the best arch of the given
modifiers which still is compatible with the system
s->enhances = adddep(pool, &pd, s->enhances, value, 0);
/* FRESHENS doesn't seem to exist. */
else if (code10 && istag ("TYPE"))
- repo_set_str(repo, s - pool->solvables, PRODUCT_TYPE, value);
+ repodata_set_str(data, s - pool->solvables, PRODUCT_TYPE, value);
/* XXX do something about LINGUAS and ARCH?
* <ma>: Don't think so. zypp does not use or propagate them.
#undef istag
}
else
- pool_debug(pool, SAT_ERROR, "repo_content: malformed line: %s\n", line);
+ pool_debug(pool, SOLV_ERROR, "repo_content: malformed line: %s\n", line);
}
if (datadir)
if (s && !s->name)
{
- pool_debug(pool, SAT_FATAL, "repo_content: 'content' incomplete, no product solvable created!\n");
- repo_free_solvable_block(repo, s - pool->solvables, 1, 1);
+ pool_debug(pool, SOLV_FATAL, "repo_content: 'content' incomplete, no product solvable created!\n");
+ repo_free_solvable(repo, s - pool->solvables, 1);
s = 0;
}
if (s)
s->evr = makeevr(pool, join(&pd, pd.tmpvers, "-", pd.tmprel));
else
s->evr = makeevr(pool, pd.tmpvers);
- pd.tmpvers = sat_free((void *)pd.tmpvers);
- pd.tmprel = sat_free((void *)pd.tmprel);
+ pd.tmpvers = solv_free((void *)pd.tmpvers);
+ pd.tmprel = solv_free((void *)pd.tmprel);
if (!s->arch)
s->arch = ARCH_NOARCH;
if (!s->evr)
s->evr = ID_EMPTY;
if (s->name && s->arch != ARCH_SRC && s->arch != ARCH_NOSRC)
- s->provides = repo_addid_dep(repo, s->provides, rel2id(pool, s->name, s->evr, REL_EQ, 1), 0);
+ s->provides = repo_addid_dep(repo, s->provides, pool_rel2id(pool, s->name, s->evr, REL_EQ, 1), 0);
if (code10)
s->supplements = repo_fix_supplements(repo, s->provides, s->supplements, 0);
/* self provides */
if (s->name && p->arch != ARCH_SRC && p->arch != ARCH_NOSRC)
- p->provides = repo_addid_dep(repo, p->provides, rel2id(pool, p->name, p->evr, REL_EQ, 1), 0);
+ p->provides = repo_addid_dep(repo, p->provides, pool_rel2id(pool, p->name, p->evr, REL_EQ, 1), 0);
/* now merge the attributes */
repodata_merge_attrs(data, p - pool->solvables, s - pool->solvables);
}
if (pd.tmp)
- sat_free(pd.tmp);
- sat_free(line);
- sat_free(otherarchs);
- join_freemem();
+ solv_free(pd.tmp);
+ solv_free(line);
+ solv_free(otherarchs);
if (!(flags & REPO_NO_INTERNALIZE))
repodata_internalize(data);
+ return res;
}
projects / platform / upstream / libsolv.git / blobdiff