X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libopkg%2Fpkg_hash.c;h=62e6f0acdda5212ff816eeb1da37d5bbab9c2c54;hb=51e968e4ddffd4acd7c71e4976e1254a590f2217;hp=c63847b520f6e40005bad1a6b67532e2e3c66b90;hpb=b70dc315e405d3c59dae2a795462f85d02cbb8df;p=oweals%2Fopkg-lede.git diff --git a/libopkg/pkg_hash.c b/libopkg/pkg_hash.c index c63847b..62e6f0a 100644 --- a/libopkg/pkg_hash.c +++ b/libopkg/pkg_hash.c @@ -28,6 +28,7 @@ #include "pkg_hash.h" #include "pkg_parse.h" #include "opkg_utils.h" +#include "libbb/libbb.h" static abstract_pkg_t * add_new_abstract_pkg_by_name(hash_table_t * hash, const char * pkg_name); @@ -47,7 +48,6 @@ static abstract_pkg_t * add_new_abstract_pkg_by_name(hash_table_t * hash, const */ - int pkg_hash_init(const char *name, hash_table_t *hash, int len) { return hash_table_init(name, hash, len); @@ -94,10 +94,8 @@ static char *pkg_get_default_arch(opkg_conf_t *conf) char *def_arch = HOST_CPU_STR; /* Default arch */ int def_prio = 0; /* Other archs override this */ - l = conf->arch_list.head; - - while (l) { - nv_pair_t *nv = l->data; + list_for_each_entry(l , &conf->arch_list.head, node) { + nv_pair_t *nv = (nv_pair_t *)l->data; int priority = strtol(nv->value, NULL, 0); /* Check if this arch has higher priority, and is valid */ @@ -107,52 +105,61 @@ static char *pkg_get_default_arch(opkg_conf_t *conf) def_prio = priority; def_arch = nv->name; } - l = l->next; } - return strdup(def_arch); + return xstrdup(def_arch); } int pkg_hash_add_from_file(opkg_conf_t *conf, const char *file_name, pkg_src_t *src, pkg_dest_t *dest, int is_status_file) { - hash_table_t *hash = &conf->pkg_hash; - char **raw; - char **raw_start; - pkg_t *pkg; - - raw = raw_start = read_raw_pkgs_from_file(file_name); - if (!raw) - return -ENOMEM; - - while(*raw){ /* don't worry, we'll increment raw in the parsing function */ - pkg = pkg_new(); - if (!pkg) - return -ENOMEM; - - if (pkg_parse_raw(pkg, &raw, src, dest) == 0) { - if (!pkg->architecture) { - char *version_str = pkg_version_str_alloc(pkg); - pkg->architecture = pkg_get_default_arch(conf); - opkg_message(conf, OPKG_ERROR, "Package %s version %s has no architecture specified, defaulting to %s.\n", - pkg->name, version_str, pkg->architecture); - free(version_str); - } - hash_insert_pkg(hash, pkg, is_status_file,conf); - } else { - pkg_deinit (pkg); - free(pkg); - } - } + hash_table_t *hash = &conf->pkg_hash; + pkg_t *pkg; + FILE *fp; + char *buf; + const size_t len = 4096; + int ret = 0; + + fp = fopen(file_name, "r"); + if (fp == NULL) { + fprintf(stderr, "%s: fopen(%s): %s\n", + __FUNCTION__, file_name, strerror(errno)); + return -1; + } - /* XXX: CLEANUP: I'd like a cleaner interface for cleaning up - memory after read_raw_pkgs_from_file */ - raw = raw_start; - while (*raw) { - free(*raw++); - } - free(raw_start); - return 0; + buf = xmalloc(len); + + do { + pkg = pkg_new(); + pkg->src = src; + pkg->dest = dest; + + ret = pkg_parse_from_stream_nomalloc(pkg, fp, PFM_ALL, + &buf, len); + if (ret) { + pkg_deinit (pkg); + free(pkg); + if (ret == -1) + break; + continue; + } + + if (!pkg->architecture) { + char *version_str = pkg_version_str_alloc(pkg); + pkg->architecture = pkg_get_default_arch(conf); + opkg_message(conf, OPKG_ERROR, "Package %s version %s has no architecture specified, defaulting to %s.\n", + pkg->name, version_str, pkg->architecture); + free(version_str); + } + + hash_insert_pkg(hash, pkg, is_status_file, conf); + + } while (!feof(fp)); + + free(buf); + fclose(fp); + + return ret; } abstract_pkg_t * abstract_pkg_fetch_by_name(hash_table_t * hash, const char * pkg_name) @@ -182,14 +189,14 @@ pkg_t *pkg_hash_fetch_best_installation_candidate(opkg_conf_t *conf, abstract_pk abstract_pkg_vec_t *providers = abstract_pkg_vec_alloc(); pkg_t *latest_installed_parent = NULL; pkg_t *latest_matching = NULL; + pkg_t *priorized_matching = NULL; pkg_t *held_pkg = NULL; pkg_t *good_pkg_by_name = NULL; if (err) *err = 0; - if (matching_apkgs == NULL || providers == NULL || - apkg == NULL || apkg->provided_by == NULL || (apkg->provided_by->len == 0)) + if (apkg == NULL || apkg->provided_by == NULL || (apkg->provided_by->len == 0)) return NULL; opkg_message(conf, OPKG_DEBUG, "best installation candidate for %s\n", apkg->name); @@ -248,7 +255,9 @@ pkg_t *pkg_hash_fetch_best_installation_candidate(opkg_conf_t *conf, abstract_pk pkg_t *maybe = vec->pkgs[i]; opkg_message(conf, OPKG_DEBUG, " %s arch=%s arch_priority=%d version=%s \n", maybe->name, maybe->architecture, maybe->arch_priority, maybe->version); - if (maybe->arch_priority > 0) { + /* We make sure not to add the same package twice. Need to search for the reason why + they show up twice sometimes. */ + if ((maybe->arch_priority > 0) && (! pkg_vec_contains(matching_pkgs, maybe))) { max_count++; abstract_pkg_vec_insert(matching_apkgs, maybe->parent); pkg_vec_insert(matching_pkgs, maybe); @@ -304,16 +313,19 @@ pkg_t *pkg_hash_fetch_best_installation_candidate(opkg_conf_t *conf, abstract_pk } if (!good_pkg_by_name && !held_pkg && !latest_installed_parent && matching_apkgs->len > 1 && !quiet) { - opkg_message(conf, OPKG_ERROR, "Package=%s, %d matching providers\n", - apkg->name, matching_apkgs->len); - for (i = 0; i < matching_apkgs->len; i++) { - abstract_pkg_t *matching = matching_apkgs->pkgs[i]; - opkg_message(conf, OPKG_ERROR, " %s\n", matching->name); - } - opkg_message(conf, OPKG_ERROR, "Please select one with opkg install or opkg flag prefer\n"); - } + int prio = 0; + for (i = 0; i < matching_pkgs->len; i++) { + pkg_t *matching = matching_pkgs->pkgs[i]; + if (matching->arch_priority > prio) { + priorized_matching = matching; + prio = matching->arch_priority; + opkg_message(conf, OPKG_DEBUG, "Match with priority %i %s\n", prio, matching->name); + } + } + + } - if (matching_apkgs->len > 1 && conf->verbosity > 1) { + if (conf->verbosity >= OPKG_NOTICE && matching_apkgs->len > 1) { opkg_message(conf, OPKG_NOTICE, "%s: for apkg=%s, %d matching pkgs\n", __FUNCTION__, apkg->name, matching_pkgs->len); for (i = 0; i < matching_pkgs->len; i++) { @@ -340,6 +352,11 @@ pkg_t *pkg_hash_fetch_best_installation_candidate(opkg_conf_t *conf, abstract_pk opkg_message(conf, OPKG_INFO, " using latest version of installed package %s\n", latest_installed_parent->name); return latest_installed_parent; } + if (priorized_matching) { + opkg_message(conf, OPKG_INFO, " using priorized matching %s %s %s\n", + priorized_matching->name, priorized_matching->version, priorized_matching->architecture); + return priorized_matching; + } if (nmatching > 1) { opkg_message(conf, OPKG_INFO, " no matching pkg out of matching_apkgs=%d\n", nmatching); return NULL; @@ -381,7 +398,7 @@ pkg_t * pkg_hash_fetch_by_name_version(hash_table_t *hash, const char * version) { pkg_vec_t * vec; - register int i; + int i; char *version_str = NULL; if(!(vec = pkg_vec_fetch_by_name(hash, pkg_name))) @@ -407,7 +424,7 @@ pkg_t *pkg_hash_fetch_installed_by_name_dest(hash_table_t *hash, pkg_dest_t *dest) { pkg_vec_t * vec; - register int i; + int i; if(!(vec = pkg_vec_fetch_by_name(hash, pkg_name))) { return NULL; @@ -424,7 +441,7 @@ pkg_t *pkg_hash_fetch_installed_by_name(hash_table_t *hash, const char *pkg_name) { pkg_vec_t * vec; - register int i; + int i; if(!(vec = pkg_vec_fetch_by_name(hash, pkg_name))){ return NULL; @@ -460,17 +477,6 @@ pkg_vec_t *pkg_vec_fetch_by_name(hash_table_t *hash, const char *pkg_name) } } -static int pkg_compare_names(const void *p1, const void *p2) -{ - const pkg_t *pkg1 = *(const pkg_t **)p1; - const pkg_t *pkg2 = *(const pkg_t **)p2; - if (pkg1->name == NULL) - return 1; - if (pkg2->name == NULL) - return -1; - return(strcmp(pkg1->name, pkg2->name)); -} - static void pkg_hash_fetch_available_helper(const char *pkg_name, void *entry, void *data) { @@ -489,7 +495,6 @@ static void pkg_hash_fetch_available_helper(const char *pkg_name, void *entry, v void pkg_hash_fetch_available(hash_table_t *hash, pkg_vec_t *all) { hash_table_foreach(hash, pkg_hash_fetch_available_helper, all); - qsort(all->pkgs, all->len, sizeof(pkg_t *), pkg_compare_names); } static void pkg_hash_fetch_all_installed_helper(const char *pkg_name, void *entry, void *data) @@ -510,7 +515,6 @@ static void pkg_hash_fetch_all_installed_helper(const char *pkg_name, void *entr void pkg_hash_fetch_all_installed(hash_table_t *hash, pkg_vec_t *all) { hash_table_foreach(hash, pkg_hash_fetch_all_installed_helper, all); - qsort(all->pkgs, all->len, sizeof(void*), pkg_compare_names); } static void pkg_hash_dump_helper(const char *pkg_name, void *entry, void *data) @@ -565,10 +569,8 @@ pkg_t *hash_insert_pkg(hash_table_t *hash, pkg_t *pkg, int set_status,opkg_conf_ arch_priority = pkg->arch_priority; - if (buildDepends(hash, pkg)<0){ - fprintf(stderr, "%s : This should never happen. Report this Bug in bugzilla please \n ",__FUNCTION__); - return NULL; - } + buildDepends(hash, pkg); + ab_pkg = ensure_abstract_pkg_by_name(hash, pkg->name); if (set_status) { @@ -582,25 +584,19 @@ pkg_t *hash_insert_pkg(hash_table_t *hash, pkg_t *pkg, int set_status,opkg_conf_ if(!ab_pkg->pkgs) ab_pkg->pkgs = pkg_vec_alloc(); + buildProvides(hash, ab_pkg, pkg); + + /* need to build the conflicts graph before replaces for correct calculation of replaced_by relation */ + buildConflicts(hash, ab_pkg, pkg); + + buildReplaces(hash, ab_pkg, pkg); + + buildDependedUponBy(pkg, ab_pkg); + /* pkg_vec_insert_merge might munge package, but it returns an unmunged pkg */ pkg = pkg_vec_insert_merge(ab_pkg->pkgs, pkg, set_status,conf ); pkg->parent = ab_pkg; - if (buildProvides(hash, ab_pkg, pkg)<0){ - fprintf(stderr, "%s : This should never happen. Report this Bug in bugzilla please \n ",__FUNCTION__); - return NULL; - } - /* need to build the conflicts graph before replaces for correct calculation of replaced_by relation */ - if (buildConflicts(hash, ab_pkg, pkg)<0){ - fprintf(stderr, "%s : This should never happen. Report this Bug in bugzilla please \n ",__FUNCTION__); - return NULL; - } - if (buildReplaces(hash, ab_pkg, pkg)<0) { - fprintf(stderr, "%s : This should never happen. Report this Bug in bugzilla please \n ",__FUNCTION__); - return NULL; - } - - buildDependedUponBy(pkg, ab_pkg); return pkg; } @@ -615,7 +611,7 @@ static abstract_pkg_t * add_new_abstract_pkg_by_name(hash_table_t * hash, const ab_pkg = abstract_pkg_new(); if (ab_pkg == NULL) { return NULL; } - ab_pkg->name = strdup(pkg_name); + ab_pkg->name = xstrdup(pkg_name); hash_table_insert(hash, pkg_name, ab_pkg); return ab_pkg;