int parse_version(pkg_t * pkg, const char *vstr)
{
- char *colon, *rev;
+ char *colon, *dup, *rev;
if (strncmp(vstr, "Version:", 8) == 0)
vstr += 8;
vstr = ++colon;
}
- rev = strrchr(vstr, '-');
+
+ dup = xstrdup(vstr);
+ rev = strrchr(dup, '-');
if (rev) {
*rev++ = '\0';
pkg_set_string(pkg, PKG_REVISION, rev);
}
- pkg_set_string(pkg, PKG_VERSION, vstr);
+ pkg_set_string(pkg, PKG_VERSION, dup);
+ free(dup);
return 0;
}
return pkg_set_architecture(pkg, s, e - s);
}
-int pkg_parse_line(void *ptr, const char *line, uint mask)
+static void parse_alternatives(pkg_t *pkg, char *list)
+{
+ char *item, *tok;
+ struct pkg_alternatives *pkg_alts;
+ struct pkg_alternative **alts;
+ int nalts;
+
+ pkg_alts = pkg_get_ptr(pkg, PKG_ALTERNATIVES);
+ if (!pkg_alts) {
+ nalts = 0;
+ alts = NULL;
+ } else {
+ nalts = pkg_alts->nalts;
+ alts = pkg_alts->alts;
+ }
+
+ for (item = strtok_r(list, ",", &tok);
+ item;
+ item = strtok_r(NULL, ",", &tok)) {
+ enum pkg_alternative_field i;
+ char *val, *tok1;
+ /* the assignment was intended to quash the -Wmaybe-uninitialized warnings */
+ int prio = prio;
+ char *path = path, *altpath = altpath;
+
+ for (i = PAF_PRIO, val = strtok_r(item, ":", &tok1);
+ val && i < __PAF_MAX;
+ val = strtok_r(NULL, ":", &tok1), i++) {
+ switch (i) {
+ case PAF_PRIO:
+ prio = atoi(val);
+ break;
+ case PAF_PATH:
+ path = val;
+ break;
+ case PAF_ALTPATH:
+ altpath = val;
+ break;
+ default:
+ break;
+ }
+ }
+ if (!val && i == __PAF_MAX) {
+ char *_path, *_altpath;
+ struct pkg_alternative *alt;
+
+ /*
+ * - path must be absolute
+ * - altpath must be non-empty
+ */
+ if (path[0] != '/' || !altpath[0])
+ continue;
+
+ alt = calloc_a(sizeof(*alt),
+ &_path, strlen(path) + 1,
+ &_altpath, strlen(altpath) + 1);
+ if (!alt)
+ continue;
+ strcpy(_path, path);
+ strcpy(_altpath, altpath);
+ alt->prio = prio;
+ alt->path = _path;
+ alt->altpath = _altpath;
+ alts = xrealloc(alts, sizeof(*alts) * (nalts + 1));
+ alts[nalts++] = alt;
+ }
+ }
+
+ if (nalts > 0) {
+ if (!pkg_alts)
+ pkg_alts = xmalloc(sizeof(*pkg_alts));
+ pkg_alts->nalts = nalts;
+ pkg_alts->alts = alts;
+ pkg_set_ptr(pkg, PKG_ALTERNATIVES, pkg_alts);
+ }
+}
+
+int pkg_parse_line(void *ptr, char *line, uint mask)
{
pkg_t *pkg = (pkg_t *) ptr;
abstract_pkg_t *ab_pkg = NULL;
+ conffile_list_t *cl;
/* these flags are a bit hackish... */
static int reading_conffiles = 0, reading_description = 0;
static char *description = NULL;
- char *s;
int ret = 0;
/* Exclude globally masked fields. */
switch (*line) {
case 'A':
- if ((mask & PFM_ARCHITECTURE) && is_field("Architecture", line))
+ if ((mask & PFM_ALTERNATIVES) && is_field("Alternatives", line))
+ parse_alternatives(pkg, line + strlen("Alternatives") + 1);
+ else if ((mask & PFM_ARCHITECTURE) && is_field("Architecture", line))
parse_architecture(pkg, line + strlen("Architecture") + 1);
else if ((mask & PFM_AUTO_INSTALLED)
&& is_field("Auto-Installed", line)) {
if ((mask & PFM_CONFFILES) && is_field("Conffiles", line)) {
reading_conffiles = 1;
reading_description = 0;
+
+ cl = xcalloc(1, sizeof(*cl));
+ conffile_list_init(cl);
+ pkg_set_ptr(pkg, PKG_CONFFILES, cl);
+
goto dont_reset_flags;
} else if ((mask & PFM_CONFLICTS)
&& is_field("Conflicts", line))
if (ab_pkg && (ab_pkg->state_flag & SF_NEED_DETAIL)) {
if (!(pkg->state_flag & SF_NEED_DETAIL)) {
- opkg_msg(DEPEND, "propagating abpkg flag to pkg %s\n", pkg->name);
+ opkg_msg(DEBUG, "propagating abpkg flag to pkg %s\n", pkg->name);
pkg->state_flag |= SF_NEED_DETAIL;
}
}
case 'S':
if ((mask & PFM_SECTION) && is_field("Section", line))
pkg_set_string(pkg, PKG_SECTION, line + strlen("Section") + 1);
-#ifdef HAVE_SHA256
else if ((mask & PFM_SHA256SUM) && is_field("SHA256sum", line))
pkg_set_sha256(pkg, line + strlen("SHA256sum") + 1);
-#endif
else if ((mask & PFM_SIZE) && is_field("Size", line)) {
pkg_set_int(pkg, PKG_SIZE, strtoul(line + strlen("Size") + 1, NULL, 0));
} else if ((mask & PFM_SOURCE) && is_field("Source", line))
case ' ':
if ((mask & PFM_DESCRIPTION) && reading_description) {
- if (isatty(1)) {
- description = xrealloc(description,
- strlen(description)
- + 1 + strlen(line) +
- 1);
+ size_t len = (description ? strlen(description) : 0)
+ + (isatty(1) ? 1 : 0) + strlen(line) + 1;
+
+ description = description ? xrealloc(description, len)
+ : xcalloc(len, 1);
+
+ if (isatty(1))
strcat(description, "\n");
- } else {
- description = xrealloc(description,
- strlen(description)
- + 1 + strlen(line));
- }
- strcat(description, (line));
+
+ strcat(description, line);
goto dont_reset_flags;
} else if ((mask & PFM_CONFFILES) && reading_conffiles) {
parse_conffiles(pkg, line);
projects / oweals / opkg-lede.git / blobdiff