#include <unistd.h>
#include <errno.h>
#include <fcntl.h>
+#include <dirent.h>
#include "pool.h"
#include "repo.h"
}
}
th->off = i;
+ if (!th->path)
+ {
+ /* fake entry */
+ th->end = fread(th->blk, 1, 512, th->fp);
+ if (th->end <= 0)
+ {
+ th->eof = 1;
+ return 0;
+ }
+ th->off = 0;
+ continue;
+ }
if (th->length <= 0)
return 0;
if (readblock(th->fp, th->blk))
char *data, *pp;
if (length < 1 || length >= 1024 * 1024)
return -1;
- l = length;
- data = pp = solv_malloc(l + 512);
- for (; l > 0; l -= 512, pp += 512)
+ data = pp = solv_malloc(length + 512);
+ for (l = length; l > 0; l -= 512, pp += 512)
if (readblock(th->fp, (unsigned char *)pp))
{
solv_free(data);
return -1;
}
+ data[length] = 0;
type = 3; /* extension */
if (th->blk[156] == 'L')
{
while (length > 0)
{
int ll = 0;
- int l;
for (l = 0; l < length && pp[l] >= '0' && pp[l] <= '9'; l++)
ll = ll * 10 + (pp[l] - '0');
if (l == length || pp[l] != ' ' || ll < 1 || ll > length || pp[ll - 1] != '\n')
memcpy(prefix, th->blk + 345, 155);
prefix[155] = 0;
l = strlen(prefix);
- if (prefix[l - 1] == '/')
+ if (l && prefix[l - 1] == '/')
prefix[l - 1] = 0;
th->path = solv_dupjoin(prefix, "/", path);
}
char *p;
Id id;
- while (*line == ' ' && *line == '\t')
+ while (*line == ' ' || *line == '\t')
line++;
p = line;
while (*p && *p != ' ' && *p != '\t' && *p != '<' && *p != '=' && *p != '>')
p++;
id = pool_strn2id(pool, line, p - line, 1);
- while (*p == ' ' && *p == '\t')
+ while (*p == ' ' || *p == '\t')
p++;
if (*p == '<' || *p == '=' || *p == '>')
{
int flags = 0;
for (;; p++)
- {
+ {
if (*p == '<')
flags |= REL_LT;
else if (*p == '=')
else
break;
}
- while (*p == ' ' && *p == '\t')
+ while (*p == ' ' || *p == '\t')
p++;
line = p;
while (*p && *p != ' ' && *p != '\t')
Solvable *s;
int l, fd;
struct stat stb;
- void *pkgidhandle = 0;
+ Chksum *pkgidchk = 0;
data = repo_add_repodata(repo, flags);
- if ((fd = open(fn, O_RDONLY, 0)) < 0)
+ if ((fd = open(flags & REPO_USE_ROOTDIR ? pool_prepend_rootdir_tmp(pool, fn) : fn, O_RDONLY, 0)) < 0)
{
- pool_debug(pool, SOLV_ERROR, "repo_add_arch_pkg: %s: %s\n", fn, strerror(errno));
+ pool_error(pool, -1, "%s: %s", fn, strerror(errno));
return 0;
}
if (fstat(fd, &stb))
{
- pool_debug(pool, SOLV_ERROR, "repo_add_arch_pkg: %s: fstat failed\n", fn);
+ pool_error(pool, -1, "%s: fstat: %s", fn, strerror(errno));
close(fd);
return 0;
}
if (!(fp = solv_xfopen_fd(fn, fd, "r")))
{
- pool_debug(pool, SOLV_ERROR, "repo_add_arch_pkg: %s: fdopen failed\n", fn);
+ pool_error(pool, -1, "%s: fdopen failed", fn);
close(fd);
return 0;
}
ignoreline = 0;
s = pool_id2solvable(pool, repo_add_solvable(repo));
if (flags & ARCH_ADD_WITH_PKGID)
- pkgidhandle = solv_chksum_create(REPOKEY_TYPE_MD5);
+ pkgidchk = solv_chksum_create(REPOKEY_TYPE_MD5);
while (getsentry(&th, line, sizeof(line)))
{
l = strlen(line);
if (l == 0)
continue;
- if (pkgidhandle)
- solv_chksum_add(pkgidhandle, line, l);
+ if (pkgidchk)
+ solv_chksum_add(pkgidchk, line, l);
if (line[l - 1] != '\n')
{
ignoreline = 1;
else if (!strncmp(line, "arch = ", 7))
s->arch = pool_str2id(pool, line + 7, 1);
else if (!strncmp(line, "license = ", 10))
- repodata_set_poolstr(data, s - pool->solvables, SOLVABLE_LICENSE, line + 10);
+ repodata_add_poolstr_array(data, s - pool->solvables, SOLVABLE_LICENSE, line + 10);
else if (!strncmp(line, "replaces = ", 11))
s->obsoletes = adddep(repo, s->obsoletes, line + 11);
else if (!strncmp(line, "group = ", 8))
- repodata_set_poolstr(data, s - pool->solvables, SOLVABLE_GROUP, line + 8);
+ repodata_add_poolstr_array(data, s - pool->solvables, SOLVABLE_GROUP, line + 8);
else if (!strncmp(line, "depend = ", 9))
s->requires = adddep(repo, s->requires, line + 9);
else if (!strncmp(line, "optdepend = ", 12))
}
freetarhead(&th);
fclose(fp);
+ if (!s)
+ {
+ pool_error(pool, -1, "%s: not an arch package", fn);
+ if (pkgidchk)
+ solv_chksum_free(pkgidchk, 0);
+ return 0;
+ }
if (s && !s->name)
{
- repo_free_solvable_block(repo, s - pool->solvables, 1, 1);
+ pool_error(pool, -1, "%s: package has no name", fn);
+ repo_free_solvable(repo, s - pool->solvables, 1);
s = 0;
}
if (s)
{
if (!s->arch)
- s->arch = ARCH_NOARCH;
+ s->arch = ARCH_ANY;
if (!s->evr)
s->evr = ID_EMPTY;
s->provides = repo_addid_dep(repo, s->provides, pool_rel2id(pool, s->name, s->evr, REL_EQ, 1), 0);
- repodata_set_location(data, s - pool->solvables, 0, 0, fn);
- repodata_set_num(data, s - pool->solvables, SOLVABLE_DOWNLOADSIZE, (unsigned long long)stb.st_size);
- if (pkgidhandle)
+ if (!(flags & REPO_NO_LOCATION))
+ repodata_set_location(data, s - pool->solvables, 0, 0, fn);
+ if (S_ISREG(stb.st_mode))
+ repodata_set_num(data, s - pool->solvables, SOLVABLE_DOWNLOADSIZE, (unsigned long long)stb.st_size);
+ if (pkgidchk)
{
unsigned char pkgid[16];
- solv_chksum_free(pkgidhandle, pkgid);
+ solv_chksum_free(pkgidchk, pkgid);
repodata_set_bin_checksum(data, s - pool->solvables, SOLVABLE_PKGID, REPOKEY_TYPE_MD5, pkgid);
- pkgidhandle = 0;
+ pkgidchk = 0;
}
}
- if (pkgidhandle)
- solv_chksum_free(pkgidhandle, 0);
+ if (pkgidchk)
+ solv_chksum_free(pkgidchk, 0);
if (!(flags & REPO_NO_INTERNALIZE))
repodata_internalize(data);
return s ? s - pool->solvables : 0;
}
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;
}
static Solvable *
-joinhash_lookup(Repo *repo, Hashtable ht, Hashmask hm, const char *fn)
+joinhash_lookup(Repo *repo, Hashtable ht, Hashval hm, const char *fn)
{
const char *p;
Id name, evr;
return 0;
}
+static void
+adddata(Repodata *data, Solvable *s, struct tarhead *th)
+{
+ Repo *repo = data->repo;
+ Pool *pool = repo->pool;
+ char line[4096];
+ int l;
+ int havesha256 = 0;
+
+ while (getsentry(th, line, sizeof(line)))
+ {
+ l = strlen(line);
+ if (l == 0 || line[l - 1] != '\n')
+ continue;
+ line[--l] = 0;
+ if (l <= 2 || line[0] != '%' || line[l - 1] != '%')
+ continue;
+ if (!strcmp(line, "%FILENAME%"))
+ {
+ if (getsentrynl(th, line, sizeof(line)))
+ repodata_set_location(data, s - pool->solvables, 0, 0, line);
+ }
+ else if (!strcmp(line, "%NAME%"))
+ {
+ if (getsentrynl(th, line, sizeof(line)))
+ s->name = pool_str2id(pool, line, 1);
+ }
+ else if (!strcmp(line, "%VERSION%"))
+ {
+ if (getsentrynl(th, line, sizeof(line)))
+ s->evr = pool_str2id(pool, line, 1);
+ }
+ else if (!strcmp(line, "%DESC%"))
+ {
+ if (getsentrynl(th, line, sizeof(line)))
+ {
+ repodata_set_str(data, s - pool->solvables, SOLVABLE_SUMMARY, line);
+ repodata_set_str(data, s - pool->solvables, SOLVABLE_DESCRIPTION, line);
+ }
+ }
+ else if (!strcmp(line, "%GROUPS%"))
+ {
+ if (getsentrynl(th, line, sizeof(line)))
+ repodata_add_poolstr_array(data, s - pool->solvables, SOLVABLE_GROUP, line);
+ }
+ else if (!strcmp(line, "%CSIZE%"))
+ {
+ if (getsentrynl(th, line, sizeof(line)))
+ repodata_set_num(data, s - pool->solvables, SOLVABLE_DOWNLOADSIZE, strtoull(line, 0, 10));
+ }
+ else if (!strcmp(line, "%ISIZE%"))
+ {
+ if (getsentrynl(th, line, sizeof(line)))
+ repodata_set_num(data, s - pool->solvables, SOLVABLE_INSTALLSIZE, strtoull(line, 0, 10));
+ }
+ else if (!strcmp(line, "%MD5SUM%"))
+ {
+ if (getsentrynl(th, line, sizeof(line)) && !havesha256)
+ repodata_set_checksum(data, s - pool->solvables, SOLVABLE_CHECKSUM, REPOKEY_TYPE_MD5, line);
+ }
+ else if (!strcmp(line, "%SHA256SUM%"))
+ {
+ if (getsentrynl(th, line, sizeof(line)))
+ {
+ repodata_set_checksum(data, s - pool->solvables, SOLVABLE_CHECKSUM, REPOKEY_TYPE_SHA256, line);
+ havesha256 = 1;
+ }
+ }
+ else if (!strcmp(line, "%URL%"))
+ {
+ if (getsentrynl(th, line, sizeof(line)))
+ repodata_set_str(data, s - pool->solvables, SOLVABLE_URL, line);
+ }
+ else if (!strcmp(line, "%LICENSE%"))
+ {
+ if (getsentrynl(th, line, sizeof(line)))
+ repodata_add_poolstr_array(data, s - pool->solvables, SOLVABLE_LICENSE, line);
+ }
+ else if (!strcmp(line, "%ARCH%"))
+ {
+ if (getsentrynl(th, line, sizeof(line)))
+ s->arch = pool_str2id(pool, line, 1);
+ }
+ else if (!strcmp(line, "%BUILDDATE%"))
+ {
+ if (getsentrynl(th, line, sizeof(line)))
+ repodata_set_num(data, s - pool->solvables, SOLVABLE_BUILDTIME, strtoull(line, 0, 10));
+ }
+ else if (!strcmp(line, "%PACKAGER%"))
+ {
+ if (getsentrynl(th, line, sizeof(line)))
+ repodata_set_poolstr(data, s - pool->solvables, SOLVABLE_PACKAGER, line);
+ }
+ else if (!strcmp(line, "%REPLACES%"))
+ {
+ while (getsentrynl(th, line, sizeof(line)) && *line)
+ s->obsoletes = adddep(repo, s->obsoletes, line);
+ }
+ else if (!strcmp(line, "%DEPENDS%"))
+ {
+ while (getsentrynl(th, line, sizeof(line)) && *line)
+ s->requires = adddep(repo, s->requires, line);
+ }
+ else if (!strcmp(line, "%CONFLICTS%"))
+ {
+ while (getsentrynl(th, line, sizeof(line)) && *line)
+ s->conflicts = adddep(repo, s->conflicts, line);
+ }
+ else if (!strcmp(line, "%PROVIDES%"))
+ {
+ while (getsentrynl(th, line, sizeof(line)) && *line)
+ s->provides = adddep(repo, s->provides, line);
+ }
+ else if (!strcmp(line, "%OPTDEPENDS%"))
+ {
+ while (getsentrynl(th, line, sizeof(line)) && *line)
+ {
+ char *p = strchr(line, ':');
+ if (p && p > line)
+ *p = 0;
+ s->suggests = adddep(repo, s->suggests, line);
+ }
+ }
+ else if (!strcmp(line, "%FILES%"))
+ {
+ while (getsentrynl(th, line, sizeof(line)) && *line)
+ {
+ char *p;
+ Id id;
+ l = strlen(line);
+ if (l > 1 && line[l - 1] == '/')
+ line[--l] = 0; /* remove trailing slashes */
+ if ((p = strrchr(line , '/')) != 0)
+ {
+ *p++ = 0;
+ if (line[0] != '/') /* anchor */
+ {
+ char tmp = *p;
+ memmove(line + 1, line, p - 1 - line);
+ *line = '/';
+ *p = 0;
+ id = repodata_str2dir(data, line, 1);
+ *p = tmp;
+ }
+ else
+ id = repodata_str2dir(data, line, 1);
+ }
+ else
+ {
+ p = line;
+ id = 0;
+ }
+ if (!id)
+ id = repodata_str2dir(data, "/", 1);
+ repodata_add_dirstr(data, s - pool->solvables, SOLVABLE_FILELIST, id, p);
+ }
+ }
+ while (*line)
+ getsentrynl(th, line, sizeof(line));
+ }
+}
+
+static void
+finishsolvable(Repo *repo, Solvable *s)
+{
+ Pool *pool = repo->pool;
+ if (!s)
+ return;
+ if (!s->name)
+ {
+ repo_free_solvable(repo, s - pool->solvables, 1);
+ return;
+ }
+ if (!s->arch)
+ s->arch = ARCH_ANY;
+ if (!s->evr)
+ s->evr = ID_EMPTY;
+ s->provides = repo_addid_dep(repo, s->provides, pool_rel2id(pool, s->name, s->evr, REL_EQ, 1), 0);
+}
+
int
repo_add_arch_repo(Repo *repo, FILE *fp, int flags)
{
Pool *pool = repo->pool;
Repodata *data;
- data = repo_add_repodata(repo, flags);
struct tarhead th;
char *lastdn = 0;
- int l, lastdnlen = 0;
- char line[4096];
+ int lastdnlen = 0;
Solvable *s = 0;
- int havesha256 = 0;
Hashtable joinhash = 0;
- Hashmask joinhashmask = 0;
+ Hashval joinhashmask = 0;
+
+ data = repo_add_repodata(repo, flags);
if (flags & REPO_EXTEND_SOLVABLES)
joinhash = joinhash_init(repo, &joinhashmask);
}
if (!lastdn || (bn - th.path) != lastdnlen || strncmp(lastdn, th.path, lastdnlen) != 0)
{
- if (s)
- {
- if (s && !s->name)
- {
- repo_free_solvable_block(repo, s - pool->solvables, 1, 1);
- s = 0;
- }
- if (s)
- {
- if (!s->arch)
- s->arch = ARCH_NOARCH;
- if (!s->evr)
- s->evr = ID_EMPTY;
- s->provides = repo_addid_dep(repo, s->provides, pool_rel2id(pool, s->name, s->evr, REL_EQ, 1), 0);
- }
- }
+ finishsolvable(repo, s);
solv_free(lastdn);
lastdn = solv_strdup(th.path);
lastdnlen = bn - th.path;
}
else
s = pool_id2solvable(pool, repo_add_solvable(repo));
- havesha256 = 0;
}
- while (getsentry(&th, line, sizeof(line)))
+ adddata(data, s, &th);
+ }
+ finishsolvable(repo, s);
+ solv_free(joinhash);
+ solv_free(lastdn);
+ if (!(flags & REPO_NO_INTERNALIZE))
+ repodata_internalize(data);
+ return 0;
+}
+
+int
+repo_add_arch_local(Repo *repo, const char *dir, int flags)
+{
+ Pool *pool = repo->pool;
+ Repodata *data;
+ DIR *dp;
+ struct dirent *de;
+ char *entrydir, *file;
+ FILE *fp;
+ Solvable *s;
+
+ data = repo_add_repodata(repo, flags);
+
+ if (flags & REPO_USE_ROOTDIR)
+ dir = pool_prepend_rootdir(pool, dir);
+ dp = opendir(dir);
+ if (dp)
+ {
+ while ((de = readdir(dp)) != 0)
{
- l = strlen(line);
- if (l == 0 || line[l - 1] != '\n')
- continue;
- line[--l] = 0;
- if (l <= 2 || line[0] != '%' || line[l - 1] != '%')
+ if (!de->d_name[0] || de->d_name[0] == '.')
continue;
- if (!strcmp(line, "%FILENAME%"))
- {
- if (getsentrynl(&th, line, sizeof(line)))
- repodata_set_location(data, s - pool->solvables, 0, 0, line);
- }
- else if (!strcmp(line, "%NAME%"))
- {
- if (getsentrynl(&th, line, sizeof(line)))
- s->name = pool_str2id(pool, line, 1);
- }
- else if (!strcmp(line, "%VERSION%"))
- {
- if (getsentrynl(&th, line, sizeof(line)))
- s->evr = pool_str2id(pool, line, 1);
- }
- else if (!strcmp(line, "%DESC%"))
- {
- if (getsentrynl(&th, line, sizeof(line)))
- {
- repodata_set_str(data, s - pool->solvables, SOLVABLE_SUMMARY, line);
- repodata_set_str(data, s - pool->solvables, SOLVABLE_DESCRIPTION, line);
- }
- }
- else if (!strcmp(line, "%GROUPS%"))
- {
- if (getsentrynl(&th, line, sizeof(line)))
- repodata_set_poolstr(data, s - pool->solvables, SOLVABLE_GROUP, line);
- }
- else if (!strcmp(line, "%CSIZE%"))
- {
- if (getsentrynl(&th, line, sizeof(line)))
- repodata_set_num(data, s - pool->solvables, SOLVABLE_DOWNLOADSIZE, strtoull(line, 0, 10));
- }
- else if (!strcmp(line, "%ISIZE%"))
- {
- if (getsentrynl(&th, line, sizeof(line)))
- repodata_set_num(data, s - pool->solvables, SOLVABLE_INSTALLSIZE, strtoull(line, 0, 10));
- }
- else if (!strcmp(line, "%MD5SUM%"))
- {
- if (getsentrynl(&th, line, sizeof(line)) && !havesha256)
- repodata_set_checksum(data, s - pool->solvables, SOLVABLE_CHECKSUM, REPOKEY_TYPE_MD5, line);
- }
- else if (!strcmp(line, "%SHA256SUM%"))
- {
- if (getsentrynl(&th, line, sizeof(line)))
- {
- repodata_set_checksum(data, s - pool->solvables, SOLVABLE_CHECKSUM, REPOKEY_TYPE_SHA256, line);
- havesha256 = 1;
- }
- }
- else if (!strcmp(line, "%URL%"))
- {
- if (getsentrynl(&th, line, sizeof(line)))
- repodata_set_str(data, s - pool->solvables, SOLVABLE_URL, line);
- }
- else if (!strcmp(line, "%LICENSE%"))
- {
- if (getsentrynl(&th, line, sizeof(line)))
- repodata_set_str(data, s - pool->solvables, SOLVABLE_LICENSE, line);
- }
- else if (!strcmp(line, "%ARCH%"))
- {
- if (getsentrynl(&th, line, sizeof(line)))
- s->arch = pool_str2id(pool, line, 1);
- }
- else if (!strcmp(line, "%BUILDDATE%"))
- {
- if (getsentrynl(&th, line, sizeof(line)))
- repodata_set_num(data, s - pool->solvables, SOLVABLE_BUILDTIME, strtoull(line, 0, 10));
- }
- else if (!strcmp(line, "%PACKAGER%"))
- {
- if (getsentrynl(&th, line, sizeof(line)))
- repodata_set_poolstr(data, s - pool->solvables, SOLVABLE_PACKAGER, line);
- }
- else if (!strcmp(line, "%REPLACES%"))
- {
- while (getsentrynl(&th, line, sizeof(line)) && *line)
- s->obsoletes = adddep(repo, s->obsoletes, line);
- }
- else if (!strcmp(line, "%DEPENDS%"))
- {
- while (getsentrynl(&th, line, sizeof(line)) && *line)
- s->requires = adddep(repo, s->requires, line);
- }
- else if (!strcmp(line, "%CONFLICTS%"))
- {
- while (getsentrynl(&th, line, sizeof(line)) && *line)
- s->conflicts = adddep(repo, s->conflicts, line);
- }
- else if (!strcmp(line, "%PROVIDES%"))
- {
- while (getsentrynl(&th, line, sizeof(line)) && *line)
- s->provides = adddep(repo, s->provides, line);
- }
- else if (!strcmp(line, "%OPTDEPENDS%"))
- {
- while (getsentrynl(&th, line, sizeof(line)) && *line)
- {
- char *p = strchr(line, ':');
- if (p && p > line)
- *p = 0;
- s->suggests = adddep(repo, s->suggests, line);
- }
- }
- else if (!strcmp(line, "%FILES%"))
+ entrydir = solv_dupjoin(dir, "/", de->d_name);
+ file = pool_tmpjoin(repo->pool, entrydir, "/desc", 0);
+ s = 0;
+ if ((fp = fopen(file, "r")) != 0)
{
- while (getsentrynl(&th, line, sizeof(line)) && *line)
+ struct tarhead th;
+ inittarhead(&th, fp);
+ s = pool_id2solvable(pool, repo_add_solvable(repo));
+ adddata(data, s, &th);
+ freetarhead(&th);
+ fclose(fp);
+ file = pool_tmpjoin(repo->pool, entrydir, "/files", 0);
+ if ((fp = fopen(file, "r")) != 0)
{
- char *p;
- Id id;
- l = strlen(line);
- if (l > 1 && line[l - 1] == '/')
- line[--l] = 0; /* remove trailing slashes */
- if ((p = strrchr(line , '/')) != 0)
- {
- *p++ = 0;
- if (line[0] != '/') /* anchor */
- {
- char tmp = *p;
- memmove(line + 1, line, p - 1 - line);
- *line = '/';
- *p = 0;
- id = repodata_str2dir(data, line, 1);
- *p = tmp;
- }
- else
- id = repodata_str2dir(data, line, 1);
- }
- else
- {
- p = line;
- id = 0;
- }
- if (!id)
- id = repodata_str2dir(data, "/", 1);
- repodata_add_dirstr(data, s - pool->solvables, SOLVABLE_FILELIST, id, p);
+ inittarhead(&th, fp);
+ adddata(data, s, &th);
+ freetarhead(&th);
+ fclose(fp);
}
}
- while (*line)
- getsentrynl(&th, line, sizeof(line));
+ solv_free(entrydir);
}
+ closedir(dp);
}
- if (s)
- {
- if (s && !s->name)
- {
- repo_free_solvable_block(repo, s - pool->solvables, 1, 1);
- s = 0;
- }
- if (s)
- {
- if (!s->arch)
- s->arch = ARCH_NOARCH;
- if (!s->evr)
- s->evr = ID_EMPTY;
- s->provides = repo_addid_dep(repo, s->provides, pool_rel2id(pool, s->name, s->evr, REL_EQ, 1), 0);
- }
- }
- solv_free(joinhash);
- solv_free(lastdn);
if (!(flags & REPO_NO_INTERNALIZE))
repodata_internalize(data);
+ if (flags & REPO_USE_ROOTDIR)
+ solv_free((char *)dir);
return 0;
}
projects / platform / upstream / libsolv.git / blobdiff