General Public License for more details.
*/
-#include "config.h"
-
#include <stdio.h>
#include <ctype.h>
#include <unistd.h>
}
pkg->state_want = pkg_state_want_from_str(sw_str);
- pkg->state_flag = pkg_state_flag_from_str(sf_str);
+ pkg->state_flag |= pkg_state_flag_from_str(sf_str);
pkg->state_status = pkg_state_status_from_str(ss_str);
}
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)
+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. */
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))
break;
case 'M':
- if ((mask & PFM_MD5SUM) && (is_field("MD5sum:", line) || is_field("MD5Sum:", line))) {
- size_t len;
- char *cksum = checksum_hex2bin(line + strlen("MD5sum") + 1, &len);
- if (cksum && len == 16)
- pkg_set_raw(pkg, PKG_MD5SUM, cksum, len);
- }
+ if ((mask & PFM_MD5SUM) && (is_field("MD5sum:", line) || is_field("MD5Sum:", line)))
+ pkg_set_md5(pkg, line + strlen("MD5sum") + 1);
else if ((mask & PFM_MAINTAINER)
&& is_field("Maintainer", line))
pkg_set_string(pkg, PKG_MAINTAINER, line + strlen("Maintainer") + 1);
break;
case 'P':
- if ((mask & PFM_PACKAGE) && is_field("Package", line))
+ if ((mask & PFM_PACKAGE) && is_field("Package", line)) {
pkg->name = parse_simple("Package", line);
+ ab_pkg = abstract_pkg_fetch_by_name(pkg->name);
+
+ if (ab_pkg && (ab_pkg->state_flag & SF_NEED_DETAIL)) {
+ if (!(pkg->state_flag & SF_NEED_DETAIL)) {
+ opkg_msg(DEBUG, "propagating abpkg flag to pkg %s\n", pkg->name);
+ pkg->state_flag |= SF_NEED_DETAIL;
+ }
+ }
+ }
else if ((mask & PFM_PRIORITY) && is_field("Priority", line))
pkg_set_string(pkg, PKG_PRIORITY, line + strlen("Priority") + 1);
else if ((mask & PFM_PROVIDES) && is_field("Provides", line))
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)) {
- size_t len;
- char *cksum = checksum_hex2bin(line + strlen("SHA256sum") + 1, &len);
- if (cksum && len == 32)
- pkg_set_raw(pkg, PKG_SHA256SUM, cksum, len);
- }
-#endif
+ else if ((mask & PFM_SHA256SUM) && is_field("SHA256sum", line))
+ pkg_set_sha256(pkg, line + strlen("SHA256sum") + 1);
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))