libopkg: initialize conffile list during status parsing

[oweals/opkg-lede.git] / libopkg / pkg_parse.c

diff --git a/libopkg/pkg_parse.c b/libopkg/pkg_parse.c
index eca0b027c56121a46b2eb4289fd6a83945fcf48e..7017a06b6f10af45d562fcae68225f0bc21bb3c9 100644 (file)
--- a/libopkg/pkg_parse.c
+++ b/libopkg/pkg_parse.c
@@ -16,8 +16,6 @@
    General Public License for more details.
 */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <ctype.h>
 #include <unistd.h>
@@ -42,7 +40,7 @@ static void parse_status(pkg_t * pkg, const char *sstr)
        }
 
        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);
 }
 
@@ -65,7 +63,7 @@ static void parse_conffiles(pkg_t * pkg, const char *cstr)
 
 int parse_version(pkg_t * pkg, const char *vstr)
 {
-       char *colon, *rev;
+       char *colon, *dup, *rev;
 
        if (strncmp(vstr, "Version:", 8) == 0)
                vstr += 8;
@@ -83,14 +81,17 @@ int parse_version(pkg_t * pkg, const char *vstr)
                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;
 }
@@ -115,6 +116,7 @@ int pkg_parse_line(void *ptr, const 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;
@@ -145,6 +147,11 @@ int pkg_parse_line(void *ptr, const char *line, uint mask)
                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))
@@ -194,8 +201,17 @@ int pkg_parse_line(void *ptr, const char *line, uint mask)
                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(DEPEND, "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))
@@ -215,10 +231,8 @@ int pkg_parse_line(void *ptr, const char *line, uint mask)
        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))