X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=blobdiff_plain;f=libopkg%2Fpkg_hash.c;h=f5c049507848e31748624079e69e7522ceb9abb8;hp=26e77485e2e93dabaf61dbdc2132423dba7612fa;hb=9396bd4a4c84bde6b55ac3c47c90b4804e51adaf;hpb=69bae440fd21376d2a717575b1418c962396bd21

diff --git a/libopkg/pkg_hash.c b/libopkg/pkg_hash.c
index 26e7748..f5c0495 100644
--- a/libopkg/pkg_hash.c
+++ b/libopkg/pkg_hash.c
@@ -1,7 +1,7 @@
-/* opkg_hash.c - the itsy package management system
+/* opkg_hash.c - the opkg package management system
 
    Steven M. Ayer
-   
+
    Copyright (C) 2002 Compaq Computer Corporation
 
    This program is free software; you can redistribute it and/or
@@ -15,603 +15,703 @@
    General Public License for more details.
 */
 
-#include "includes.h"
-#include <errno.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
+#include <stdio.h>
 
 #include "hash_table.h"
 #include "pkg.h"
 #include "opkg_message.h"
 #include "pkg_vec.h"
 #include "pkg_hash.h"
+#include "parse_util.h"
 #include "pkg_parse.h"
 #include "opkg_utils.h"
+#include "sprintf_alloc.h"
+#include "file_util.h"
+#include "libbb/libbb.h"
+#include "libbb/gzip.h"
 
-static abstract_pkg_t * add_new_abstract_pkg_by_name(hash_table_t * hash, const char * pkg_name);
+void pkg_hash_init(void)
+{
+	hash_table_init("pkg-hash", &conf->pkg_hash,
+			OPKG_CONF_DEFAULT_HASH_LEN);
+}
 
-/*
- * this will talk to both feeds-lists files and installed status files
- * example api:
- *
- * hash_table_t hash;
- * pkg_hash_init(name, &hash, 1000);
- * pkg_hash_add_from_file(<feed filename>);
- *
- * the query function is just there as a shell to prove to me that this
- * sort of works, but isn't far from doing something useful
- * 
- * -sma, 12/21/01
- * modified: CDW 3 Jan. 2002
- */
+static void free_pkgs(const char *key, void *entry, void *data)
+{
+	int i;
+	abstract_pkg_t *ab_pkg;
 
+	/* Each entry in the hash table is an abstract package, which contains
+	 * a list of packages that provide the abstract package.
+	 */
 
-
-int pkg_hash_init(const char *name, hash_table_t *hash, int len)
-{
-  return hash_table_init(name, hash, len);
+	ab_pkg = (abstract_pkg_t *) entry;
+
+	if (ab_pkg->pkgs) {
+		for (i = 0; i < ab_pkg->pkgs->len; i++) {
+			pkg_deinit(ab_pkg->pkgs->pkgs[i]);
+			free(ab_pkg->pkgs->pkgs[i]);
+		}
+	}
+
+	abstract_pkg_vec_free(ab_pkg->provided_by);
+	abstract_pkg_vec_free(ab_pkg->replaced_by);
+	pkg_vec_free(ab_pkg->pkgs);
+	free(ab_pkg->depended_upon_by);
+	free(ab_pkg->name);
+	free(ab_pkg);
 }
 
-void pkg_hash_deinit(hash_table_t *hash)
+void pkg_hash_deinit(void)
 {
-  hash_table_deinit(hash);
+	hash_table_foreach(&conf->pkg_hash, free_pkgs, NULL);
+	hash_table_deinit(&conf->pkg_hash);
 }
 
-
-/* Find the default arch for a given package status file if none is given. */
-static char *pkg_get_default_arch(opkg_conf_t *conf)
+int dist_hash_add_from_file(const char *lists_dir, pkg_src_t * dist)
 {
-     nv_pair_list_elt_t *l;
-     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;
-	  int priority = strtol(nv->value, NULL, 0);
-
-	  /* Check if this arch has higher priority, and is valid */
-	  if ((priority > def_prio) &&
-	      (strcmp(nv->name, "all")) && (strcmp(nv->name, "noarch"))) {
-	       /* Our new default */
-	       def_prio = priority;
-	       def_arch = nv->name;
-	  }
-	  l = l->next;
-     }
-
-     return strdup(def_arch);
+	nv_pair_list_elt_t *l;
+	char *list_file, *subname;
+
+	list_for_each_entry(l, &conf->arch_list.head, node) {
+		nv_pair_t *nv = (nv_pair_t *) l->data;
+		sprintf_alloc(&subname, "%s-%s", dist->name, nv->name);
+		sprintf_alloc(&list_file, "%s/%s", lists_dir, subname);
+
+		if (file_exists(list_file)) {
+			if (pkg_hash_add_from_file(list_file, dist, NULL, 0)) {
+				free(list_file);
+				return -1;
+			}
+			pkg_src_list_append(&conf->pkg_src_list, subname,
+					    dist->value, "__dummy__", 0);
+		}
+
+		free(list_file);
+	}
+
+	return 0;
 }
 
-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)
+int
+pkg_hash_add_from_file(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 {
-	       free(pkg);
-	  }
-     }
-
-     /* 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;
+	pkg_t *pkg;
+	FILE *fp;
+	char *buf;
+	const size_t len = 4096;
+	int ret = 0;
+	struct gzip_handle zh;
+
+	if (src && src->gzip) {
+		fp = gzip_fdopen(&zh, file_name);
+	} else {
+		fp = fopen(file_name, "r");
+	}
+
+	if (fp == NULL) {
+		opkg_perror(ERROR, "Failed to open %s", file_name);
+		return -1;
+	}
+
+	buf = xmalloc(len);
+
+	do {
+		pkg = pkg_new();
+		pkg->src = src;
+		pkg->dest = dest;
+
+		ret = parse_from_stream_nomalloc(pkg_parse_line, pkg, fp, 0,
+						 &buf, len);
+
+		if (pkg->name == NULL) {
+			/* probably just a blank line */
+			ret = 1;
+		}
+
+		if (ret) {
+			pkg_deinit(pkg);
+			free(pkg);
+			if (ret == -1)
+				break;
+			if (ret == 1)
+				/* Probably a blank line, continue parsing. */
+				ret = 0;
+			continue;
+		}
+
+		if (!pkg_get_architecture(pkg) || !pkg_get_arch_priority(pkg)) {
+			char *version_str = pkg_version_str_alloc(pkg);
+			opkg_msg(NOTICE, "Package %s version %s has no "
+				 "valid architecture, ignoring.\n",
+				 pkg->name, version_str);
+			free(version_str);
+			continue;
+		}
+
+		hash_insert_pkg(pkg, is_status_file);
+
+	} while (!feof(fp));
+
+	free(buf);
+	fclose(fp);
+
+	if (src && src->gzip)
+		gzip_close(&zh);
+
+	return ret;
 }
 
-abstract_pkg_t * abstract_pkg_fetch_by_name(hash_table_t * hash, const char * pkg_name)
+/*
+ * Load in feed files from the cached "src" and/or "src/gz" locations.
+ */
+int pkg_hash_load_feeds(void)
 {
-  return (abstract_pkg_t *)hash_table_get(hash, pkg_name);
+	pkg_src_list_elt_t *iter;
+	pkg_src_t *src, *subdist;
+	char *list_file, *lists_dir;
+
+	opkg_msg(INFO, "\n");
+
+	lists_dir = conf->restrict_to_default_dest ?
+	    conf->default_dest->lists_dir : conf->lists_dir;
+
+	for (iter = void_list_first(&conf->pkg_src_list); iter;
+	     iter = void_list_next(&conf->pkg_src_list, iter)) {
+
+		src = (pkg_src_t *) iter->data;
+
+		sprintf_alloc(&list_file, "%s/%s", lists_dir, src->name);
+
+		if (file_exists(list_file)) {
+			if (pkg_hash_add_from_file(list_file, src, NULL, 0)) {
+				free(list_file);
+				return -1;
+			}
+		}
+		free(list_file);
+	}
+
+	return 0;
 }
 
-abstract_pkg_vec_t *pkg_hash_fetch_all_installation_candidates(hash_table_t *hash, const char *name)
+/*
+ * Load in status files from the configured "dest"s.
+ */
+int pkg_hash_load_status_files(void)
 {
-    abstract_pkg_t *apkg = abstract_pkg_fetch_by_name(hash, name);
-    if (apkg)
-       return NULL;
-    return apkg->provided_by;
-}
+	pkg_dest_list_elt_t *iter;
+	pkg_dest_t *dest;
 
+	opkg_msg(INFO, "\n");
 
-pkg_t *pkg_hash_fetch_best_installation_candidate(opkg_conf_t *conf, abstract_pkg_t *apkg, 
-						  int (*constraint_fcn)(pkg_t *pkg, void *cdata), void *cdata, int quiet)
-{
-     int i; 
-     int nprovides = 0;
-     int nmatching = 0;
-     pkg_vec_t *matching_pkgs = pkg_vec_alloc();
-     abstract_pkg_vec_t *matching_apkgs = abstract_pkg_vec_alloc();
-     abstract_pkg_vec_t *provided_apkg_vec;
-     abstract_pkg_t **provided_apkgs;
-     abstract_pkg_vec_t *providers = abstract_pkg_vec_alloc();
-     pkg_t *latest_installed_parent = NULL;
-     pkg_t *latest_matching = NULL;
-     pkg_t *held_pkg = NULL;
-     pkg_t *good_pkg_by_name = NULL;
-
-     if (matching_apkgs == NULL || providers == NULL || 
-         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);
-
-     provided_apkg_vec = apkg->provided_by;
-     nprovides = provided_apkg_vec->len;
-     provided_apkgs = provided_apkg_vec->pkgs;
-     if (nprovides > 1)
-	  opkg_message(conf, OPKG_DEBUG, " apkg=%s nprovides=%d\n", apkg->name, nprovides);
-
-     /* accumulate all the providers */
-     for (i = 0; i < nprovides; i++) {
-	  abstract_pkg_t *provider_apkg = provided_apkgs[i];
-	  opkg_message(conf, OPKG_DEBUG, " adding %s to providers\n", provider_apkg->name);
-	  abstract_pkg_vec_insert(providers, provider_apkg);
-     }
-     nprovides = providers->len;
-
-     for (i = 0; i < nprovides; i++) {
-	  abstract_pkg_t *provider_apkg = abstract_pkg_vec_get(providers, i);
-	  abstract_pkg_t *replacement_apkg = NULL;
-	  pkg_vec_t *vec;
-
-	  if (provider_apkg->replaced_by && provider_apkg->replaced_by->len) {
-	       replacement_apkg = provider_apkg->replaced_by->pkgs[0];
-	       if (provider_apkg->replaced_by->len > 1) {
-		    opkg_message(conf, OPKG_NOTICE, "Multiple replacers for %s, using first one (%s)\n", 
-				 provider_apkg->name, replacement_apkg->name);
-	       }
-	  }
-
-	  if (replacement_apkg)
-	       opkg_message(conf, OPKG_DEBUG, "   replacement_apkg=%s for provider_apkg=%s\n", 
-			    replacement_apkg->name, provider_apkg->name);
-
-	  if (replacement_apkg && (replacement_apkg != provider_apkg)) {
-	       if (abstract_pkg_vec_contains(providers, replacement_apkg))
-		    continue;
-	       else
-		    provider_apkg = replacement_apkg;
-	  }
-
-	  if (!(vec = provider_apkg->pkgs)) {
-	       opkg_message(conf, OPKG_DEBUG, "   no pkgs for provider_apkg %s\n", provider_apkg->name);
-	       continue;
-	  }
-    
-
-	  /* now check for supported architecture */
-	  {
-	       int max_count = 0;
-	       int i;
-
-	       /* count packages matching max arch priority and keep track of last one */
-	       for (i = 0; i < vec->len; i++) {
-		    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)  {
-			 max_count++;
-			 abstract_pkg_vec_insert(matching_apkgs, maybe->parent);
-			 pkg_vec_insert(matching_pkgs, maybe);
-		    }
-	       }
-	  }
-     }
-
-     if (matching_pkgs->len > 1)
-	  pkg_vec_sort(matching_pkgs, pkg_name_version_and_architecture_compare);
-     if (matching_apkgs->len > 1)
-	  abstract_pkg_vec_sort(matching_pkgs, abstract_pkg_name_compare);
-
-/* Here it is usefull, if ( matching_apkgs->len > 1 ), to test if one of this matching packages has the same name of the
-   needed package. In this case, I would return it for install, otherwise I will continue with the procedure */
-/* The problem is what to do when there are more than a mathing package, with the same name and several version ?
-   Until now I always got the latest, but that breaks the downgrade option.
-   If I stop at the first one, I would probably miss the new ones 
-   Maybe the way is to have some kind of flag somewhere, to see if the package been asked to install is from a file,
-   or from a Packages feed.
-   It it is from a file it always need to be checked whatever version I have in feeds or everywhere, according to force-down or whatever options*/
-/*Pigi*/
-
-     for (i = 0; i < matching_pkgs->len; i++) {
-	  pkg_t *matching = matching_pkgs->pkgs[i];
-          if (constraint_fcn(matching, cdata)) {  /* We found it */
-             opkg_message(conf, OPKG_DEBUG, " Found a valid candidate for the install: %s %s  \n", matching->name, matching->version) ;
-             good_pkg_by_name = matching;
-             if ( matching->provided_by_hand == 1 )    /* It has been provided by hand, so it is what user want */
-                break;                                 
-          }
-     }
-
-
-     for (i = 0; i < matching_pkgs->len; i++) {
-	  pkg_t *matching = matching_pkgs->pkgs[i];
-	  latest_matching = matching;
-	  if (matching->parent->state_status == SS_INSTALLED || matching->parent->state_status == SS_UNPACKED)
-	       latest_installed_parent = matching;
-	  if (matching->state_flag & (SF_HOLD|SF_PREFER)) {
-	       if (held_pkg)
-		    opkg_message(conf, OPKG_ERROR, "Multiple packages (%s and %s) providing same name marked HOLD or PREFER.  Using latest.\n",
-				 held_pkg->name, matching->name);
-	       held_pkg = matching;
-	  }
-     }
-
-     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");
-     }
-
-     if (matching_apkgs->len > 1 && conf->verbosity > 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++) {
-	       pkg_t *matching = matching_pkgs->pkgs[i];
-	       opkg_message(conf, OPKG_INFO, "    %s %s %s\n",
-			    matching->name, matching->version, matching->architecture);
-	  }
-     }
-
-     nmatching = matching_apkgs->len;
-
-     pkg_vec_free(matching_pkgs);
-     abstract_pkg_vec_free(matching_apkgs);
-     abstract_pkg_vec_free(providers);
-
-     if (good_pkg_by_name) {   /* We found a good candidate, we will install it */ 
-	  return good_pkg_by_name;
-     }
-     if (held_pkg) {
-	  opkg_message(conf, OPKG_INFO, "  using held package %s\n", held_pkg->name);
-	  return held_pkg;
-     }
-     if (latest_installed_parent) {
-	  opkg_message(conf, OPKG_INFO, "  using latest version of installed package %s\n", latest_installed_parent->name);
-	  return latest_installed_parent;
-     }
-     if (nmatching > 1) {
-	  opkg_message(conf, OPKG_INFO, "  no matching pkg out of matching_apkgs=%d\n", nmatching);
-	  return NULL;
-     }
-     if (latest_matching) {
-	  opkg_message(conf, OPKG_INFO, "  using latest matching %s %s %s\n",
-		       latest_matching->name, latest_matching->version, latest_matching->architecture);
-	  return latest_matching;
-     }
-     return NULL;
+	for (iter = void_list_first(&conf->pkg_dest_list); iter;
+	     iter = void_list_next(&conf->pkg_dest_list, iter)) {
+
+		dest = (pkg_dest_t *) iter->data;
+
+		if (file_exists(dest->status_file_name)) {
+			if (pkg_hash_add_from_file
+			    (dest->status_file_name, NULL, dest, 1))
+				return -1;
+		}
+	}
+
+	return 0;
 }
 
-static int pkg_name_constraint_fcn(pkg_t *pkg, void *cdata)
+static abstract_pkg_t *abstract_pkg_fetch_by_name(const char *pkg_name)
 {
-     const char *name = (const char *)cdata;
-     if (strcmp(pkg->name, name) == 0)
-	  return 1;
-     else
-	  return 0;   
+	return (abstract_pkg_t *) hash_table_get(&conf->pkg_hash, pkg_name);
 }
 
-pkg_t *pkg_hash_fetch_best_installation_candidate_by_name(opkg_conf_t *conf, const char *name)
+pkg_t *pkg_hash_fetch_best_installation_candidate(abstract_pkg_t * apkg,
+						  int (*constraint_fcn) (pkg_t *
+									 pkg,
+									 void
+									 *cdata),
+						  void *cdata, int quiet)
 {
-     hash_table_t *hash = &conf->pkg_hash;
-     abstract_pkg_t *apkg = NULL;
+	int i, j;
+	int nprovides = 0;
+	int nmatching = 0;
+	int wrong_arch_found = 0;
+	int arch_priority;
+	pkg_vec_t *matching_pkgs;
+	abstract_pkg_vec_t *matching_apkgs;
+	abstract_pkg_vec_t *provided_apkg_vec;
+	abstract_pkg_t **provided_apkgs;
+	abstract_pkg_vec_t *providers;
+	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 (apkg == NULL || apkg->provided_by == NULL
+	    || (apkg->provided_by->len == 0))
+		return NULL;
+
+	matching_pkgs = pkg_vec_alloc();
+	matching_apkgs = abstract_pkg_vec_alloc();
+	providers = abstract_pkg_vec_alloc();
+
+	opkg_msg(DEBUG, "Best installation candidate for %s:\n", apkg->name);
+
+	provided_apkg_vec = apkg->provided_by;
+	nprovides = provided_apkg_vec->len;
+	provided_apkgs = provided_apkg_vec->pkgs;
+	if (nprovides > 1)
+		opkg_msg(DEBUG, "apkg=%s nprovides=%d.\n", apkg->name,
+			 nprovides);
+
+	/* accumulate all the providers */
+	for (i = 0; i < nprovides; i++) {
+		abstract_pkg_t *provider_apkg = provided_apkgs[i];
+		opkg_msg(DEBUG, "Adding %s to providers.\n",
+			 provider_apkg->name);
+		abstract_pkg_vec_insert(providers, provider_apkg);
+	}
+	nprovides = providers->len;
+
+	for (i = 0; i < nprovides; i++) {
+		abstract_pkg_t *provider_apkg =
+		    abstract_pkg_vec_get(providers, i);
+		abstract_pkg_t *replacement_apkg = NULL;
+		pkg_vec_t *vec;
+
+		if (provider_apkg->replaced_by
+		    && provider_apkg->replaced_by->len) {
+			replacement_apkg = provider_apkg->replaced_by->pkgs[0];
+			if (provider_apkg->replaced_by->len > 1) {
+				opkg_msg(NOTICE, "Multiple replacers for %s, "
+					 "using first one (%s).\n",
+					 provider_apkg->name,
+					 replacement_apkg->name);
+			}
+		}
+
+		if (replacement_apkg)
+			opkg_msg(DEBUG,
+				 "replacement_apkg=%s for provider_apkg=%s.\n",
+				 replacement_apkg->name, provider_apkg->name);
+
+		if (replacement_apkg && (replacement_apkg != provider_apkg)) {
+			if (abstract_pkg_vec_contains
+			    (providers, replacement_apkg))
+				continue;
+			else
+				provider_apkg = replacement_apkg;
+		}
+
+		if (!(vec = provider_apkg->pkgs)) {
+			opkg_msg(DEBUG, "No pkgs for provider_apkg %s.\n",
+				 provider_apkg->name);
+			continue;
+		}
+
+		/* now check for supported architecture */
+		{
+			int max_count = 0;
+
+			/* count packages matching max arch priority and keep track of last one */
+			for (j = 0; j < vec->len; j++) {
+				pkg_t *maybe = vec->pkgs[j];
+				arch_priority = pkg_get_arch_priority(maybe);
+
+				opkg_msg(DEBUG,
+					 "%s arch=%s arch_priority=%d version=%s.\n",
+					 maybe->name, pkg_get_architecture(maybe),
+					 arch_priority, pkg_get_string(maybe, PKG_VERSION));
+				/* We make sure not to add the same package twice. Need to search for the reason why
+				   they show up twice sometimes. */
+				if ((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);
+				}
+			}
+
+			if (vec->len > 0 && matching_pkgs->len < 1)
+				wrong_arch_found = 1;
+		}
+	}
 
-     if (!(apkg = abstract_pkg_fetch_by_name(hash, name)))
-	  return NULL;
-     
-     return pkg_hash_fetch_best_installation_candidate(conf, apkg, pkg_name_constraint_fcn, apkg->name, 0);
-}
+	if (matching_pkgs->len < 1) {
+		if (wrong_arch_found)
+			opkg_msg(ERROR, "Packages for %s found, but"
+				 " incompatible with the architectures configured\n",
+				 apkg->name);
+		pkg_vec_free(matching_pkgs);
+		abstract_pkg_vec_free(matching_apkgs);
+		abstract_pkg_vec_free(providers);
+		return NULL;
+	}
+
+	if (matching_pkgs->len > 1)
+		pkg_vec_sort(matching_pkgs,
+			     pkg_name_version_and_architecture_compare);
+	if (matching_apkgs->len > 1)
+		abstract_pkg_vec_sort(matching_pkgs, abstract_pkg_name_compare);
+
+	for (i = 0; i < matching_pkgs->len; i++) {
+		pkg_t *matching = matching_pkgs->pkgs[i];
+		if (constraint_fcn(matching, cdata)) {
+			opkg_msg(DEBUG, "Candidate: %s %s.\n",
+				 matching->name, pkg_get_string(matching, PKG_VERSION));
+			good_pkg_by_name = matching;
+			/* It has been provided by hand, so it is what user want */
+			if (matching->provided_by_hand == 1)
+				break;
+		}
+	}
 
+	for (i = 0; i < matching_pkgs->len; i++) {
+		pkg_t *matching = matching_pkgs->pkgs[i];
+		latest_matching = matching;
+		if (matching->parent->state_status == SS_INSTALLED
+		    || matching->parent->state_status == SS_UNPACKED)
+			latest_installed_parent = matching;
+		if (matching->state_flag & (SF_HOLD | SF_PREFER)) {
+			if (held_pkg)
+				opkg_msg(NOTICE,
+					 "Multiple packages (%s and %s) providing"
+					 " same name marked HOLD or PREFER. "
+					 "Using latest.\n", held_pkg->name,
+					 matching->name);
+			held_pkg = matching;
+		}
+	}
 
-pkg_t * pkg_hash_fetch_by_name_version(hash_table_t *hash, 
-				       const char *pkg_name,
-				       const char * version)
-{
-    pkg_vec_t * vec;
-    register int i;
-    char *version_str = NULL;
-    
-    if(!(vec = pkg_vec_fetch_by_name(hash, pkg_name)))
-	return NULL;
-    
-    for(i = 0; i < vec->len; i++) {
-	version_str = pkg_version_str_alloc(vec->pkgs[i]);
-	if(!strcmp(version_str, version)) {
-	    free(version_str);
-	    break;
+	if (!good_pkg_by_name && !held_pkg && !latest_installed_parent
+	    && matching_apkgs->len > 1 && !quiet) {
+		int prio = 0;
+		for (i = 0; i < matching_pkgs->len; i++) {
+			pkg_t *matching = matching_pkgs->pkgs[i];
+			arch_priority = pkg_get_arch_priority(matching);
+			if (arch_priority > prio) {
+				priorized_matching = matching;
+				prio = arch_priority;
+				opkg_msg(DEBUG, "Match %s with priority %i.\n",
+					 matching->name, prio);
+			}
+		}
+
+	}
+
+	if (conf->verbosity >= INFO && matching_apkgs->len > 1) {
+		opkg_msg(INFO, "%d matching pkgs for apkg=%s:\n",
+			 matching_pkgs->len, apkg->name);
+		for (i = 0; i < matching_pkgs->len; i++) {
+			pkg_t *matching = matching_pkgs->pkgs[i];
+			opkg_msg(INFO, "%s %s %s\n",
+				 matching->name, pkg_get_string(matching, PKG_VERSION),
+				 pkg_get_architecture(matching));
+		}
+	}
+
+	nmatching = matching_apkgs->len;
+
+	pkg_vec_free(matching_pkgs);
+	abstract_pkg_vec_free(matching_apkgs);
+	abstract_pkg_vec_free(providers);
+
+	if (good_pkg_by_name) {	/* We found a good candidate, we will install it */
+		return good_pkg_by_name;
+	}
+	if (held_pkg) {
+		opkg_msg(INFO, "Using held package %s.\n", held_pkg->name);
+		return held_pkg;
+	}
+	if (latest_installed_parent) {
+		opkg_msg(INFO,
+			 "Using latest version of installed package %s.\n",
+			 latest_installed_parent->name);
+		return latest_installed_parent;
+	}
+	if (priorized_matching) {
+		opkg_msg(INFO, "Using priorized matching %s %s %s.\n",
+			 priorized_matching->name, pkg_get_string(priorized_matching, PKG_VERSION),
+			 pkg_get_architecture(priorized_matching));
+		return priorized_matching;
+	}
+	if (nmatching > 1) {
+		opkg_msg(INFO, "No matching pkg out of %d matching_apkgs.\n",
+			 nmatching);
+		return NULL;
+	}
+	if (latest_matching) {
+		opkg_msg(INFO, "Using latest matching %s %s %s.\n",
+			 latest_matching->name, pkg_get_string(latest_matching, PKG_VERSION),
+			 pkg_get_architecture(latest_matching));
+		return latest_matching;
 	}
-	free(version_str);
-    }
-	
-    if(i == vec->len)
 	return NULL;
-    
-    return vec->pkgs[i];
 }
 
-pkg_t *pkg_hash_fetch_installed_by_name_dest(hash_table_t *hash,
-					     const char *pkg_name,
-					     pkg_dest_t *dest)
+static int pkg_name_constraint_fcn(pkg_t * pkg, void *cdata)
 {
-    pkg_vec_t * vec;
-    register int i;
+	const char *name = (const char *)cdata;
 
-    if(!(vec = pkg_vec_fetch_by_name(hash, pkg_name))) {
-	return NULL;
-    }
-    
-    for(i = 0; i < vec->len; i++)
-	if((vec->pkgs[i]->state_status == SS_INSTALLED || vec->pkgs[i]->state_status == SS_UNPACKED) && vec->pkgs[i]->dest == dest) {
-	    return vec->pkgs[i];
-        }
-    return NULL;
+	if (strcmp(pkg->name, name) == 0)
+		return 1;
+	else
+		return 0;
 }
 
-pkg_t *pkg_hash_fetch_installed_by_name(hash_table_t *hash,
-					const char *pkg_name)
+static pkg_vec_t *pkg_vec_fetch_by_name(const char *pkg_name)
 {
-    pkg_vec_t * vec;
-    register int i;
+	abstract_pkg_t *ab_pkg;
+
+	if (!(ab_pkg = abstract_pkg_fetch_by_name(pkg_name)))
+		return NULL;
+
+	if (ab_pkg->pkgs)
+		return ab_pkg->pkgs;
+
+	if (ab_pkg->provided_by) {
+		abstract_pkg_t *abpkg =
+		    abstract_pkg_vec_get(ab_pkg->provided_by, 0);
+		if (abpkg != NULL)
+			return abpkg->pkgs;
+		else
+			return ab_pkg->pkgs;
+	}
 
-    if(!(vec = pkg_vec_fetch_by_name(hash, pkg_name))){
 	return NULL;
-    } 
-
-    for(i = 0; i < vec->len; i++)
-	if (vec->pkgs[i]->state_status == SS_INSTALLED || vec->pkgs[i]->state_status == SS_UNPACKED){
-	    return vec->pkgs[i];
-        } 
-    
-    return NULL;
 }
 
-pkg_vec_t *pkg_vec_fetch_by_name(hash_table_t *hash, const char *pkg_name)
+pkg_t *pkg_hash_fetch_best_installation_candidate_by_name(const char *name)
 {
-    abstract_pkg_t * ab_pkg;
-
-    if(!(ab_pkg = abstract_pkg_fetch_by_name(hash, pkg_name))){
-       return NULL;
-    }
-    
-    if (ab_pkg->pkgs) {
-      return ab_pkg->pkgs;
-    } else if (ab_pkg->provided_by) {
-      abstract_pkg_t *abpkg =  abstract_pkg_vec_get(ab_pkg->provided_by, 0);
-      if (abpkg != NULL){
-	  return abpkg->pkgs;
-      } else {
-	  return ab_pkg->pkgs;
-      }
-    } else {
-      return NULL;
-    }
+	abstract_pkg_t *apkg = NULL;
+
+	if (!(apkg = abstract_pkg_fetch_by_name(name)))
+		return NULL;
+
+	return pkg_hash_fetch_best_installation_candidate(apkg,
+							  pkg_name_constraint_fcn,
+							  apkg->name, 0);
 }
 
-static int pkg_compare_names(const void *p1, const void *p2)
+pkg_t *pkg_hash_fetch_by_name_version(const char *pkg_name, const char *version)
 {
-  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));
-}
+	pkg_vec_t *vec;
+	int i;
+	char *version_str = NULL;
+
+	if (!(vec = pkg_vec_fetch_by_name(pkg_name)))
+		return NULL;
+
+	for (i = 0; i < vec->len; i++) {
+		version_str = pkg_version_str_alloc(vec->pkgs[i]);
+		if (!strcmp(version_str, version)) {
+			free(version_str);
+			break;
+		}
+		free(version_str);
+	}
 
+	if (i == vec->len)
+		return NULL;
 
-static void pkg_hash_fetch_available_helper(const char *pkg_name, void *entry, void *data)
-{
-  int j;
-  abstract_pkg_t *ab_pkg = (abstract_pkg_t *)entry;
-  pkg_vec_t *all = (pkg_vec_t *)data;
-  pkg_vec_t *pkg_vec = ab_pkg->pkgs;
-  if (pkg_vec) {
-    for (j = 0; j < pkg_vec->len; j++) {
-      pkg_t *pkg = pkg_vec->pkgs[j];
-      pkg_vec_insert(all, pkg);
-    }
-  }
+	return vec->pkgs[i];
 }
 
-void pkg_hash_fetch_available(hash_table_t *hash, pkg_vec_t *all)
+pkg_t *pkg_hash_fetch_installed_by_name_dest(const char *pkg_name,
+					     pkg_dest_t * dest)
 {
-    hash_table_foreach(hash, pkg_hash_fetch_available_helper, all);
-    qsort(all->pkgs, all->len, sizeof(pkg_t *), pkg_compare_names);
+	pkg_vec_t *vec;
+	int i;
+
+	if (!(vec = pkg_vec_fetch_by_name(pkg_name))) {
+		return NULL;
+	}
+
+	for (i = 0; i < vec->len; i++)
+		if ((vec->pkgs[i]->state_status == SS_INSTALLED
+		     || vec->pkgs[i]->state_status == SS_UNPACKED)
+		    && vec->pkgs[i]->dest == dest) {
+			return vec->pkgs[i];
+		}
+
+	return NULL;
 }
 
-static void pkg_hash_fetch_all_installed_helper(const char *pkg_name, void *entry, void *data)
+pkg_t *pkg_hash_fetch_installed_by_name(const char *pkg_name)
 {
-  abstract_pkg_t *ab_pkg = (abstract_pkg_t *)entry;
-  pkg_vec_t *all = (pkg_vec_t *)data;
-  pkg_vec_t *pkg_vec = ab_pkg->pkgs;
-  int j;
-  if (pkg_vec) {
-    for (j = 0; j < pkg_vec->len; j++) {
-      pkg_t *pkg = pkg_vec->pkgs[j];
-      if (pkg->state_status == SS_INSTALLED || pkg->state_status == SS_UNPACKED) {
-	pkg_vec_insert(all, pkg);
-      }
-    }
-  }
+	pkg_vec_t *vec;
+	int i;
+
+	if (!(vec = pkg_vec_fetch_by_name(pkg_name))) {
+		return NULL;
+	}
+
+	for (i = 0; i < vec->len; i++) {
+		if (vec->pkgs[i]->state_status == SS_INSTALLED
+		    || vec->pkgs[i]->state_status == SS_UNPACKED) {
+			return vec->pkgs[i];
+		}
+	}
+
+	return NULL;
 }
-void pkg_hash_fetch_all_installed(hash_table_t *hash, pkg_vec_t *all)
+
+static void
+pkg_hash_fetch_available_helper(const char *pkg_name, void *entry, void *data)
 {
-    hash_table_foreach(hash, pkg_hash_fetch_all_installed_helper, all);
-    qsort(all->pkgs, all->len, sizeof(void*), pkg_compare_names);
+	int j;
+	abstract_pkg_t *ab_pkg = (abstract_pkg_t *) entry;
+	pkg_vec_t *all = (pkg_vec_t *) data;
+	pkg_vec_t *pkg_vec = ab_pkg->pkgs;
+
+	if (!pkg_vec)
+		return;
+
+	for (j = 0; j < pkg_vec->len; j++) {
+		pkg_t *pkg = pkg_vec->pkgs[j];
+		pkg_vec_insert(all, pkg);
+	}
 }
 
-static void pkg_hash_dump_helper(const char *pkg_name, void *entry, void *data)
+void pkg_hash_fetch_available(pkg_vec_t * all)
 {
-  int i;
-  pkg_t *pkg;
-  abstract_pkg_t *ab_pkg = (abstract_pkg_t *)entry;
-  opkg_conf_t *conf = (opkg_conf_t *)data;
-  abstract_pkg_t ** dependents = ab_pkg->depended_upon_by;
-  fprintf(stdout, "%s\n", ab_pkg->name);
-  i = 0;
-  if (dependents != NULL)
-    while (dependents [i] != NULL)
-      printf ("\tdepended upon by - %s\n", dependents [i ++]->name);
-  dependents = ab_pkg->provided_by->pkgs;
-  i = 0;
-  if (dependents != NULL)
-    while (dependents [i] != NULL && i < ab_pkg->provided_by->len)
-      printf ("\tprovided by - %s\n", dependents [i ++]->name);
-  pkg = pkg_hash_fetch_best_installation_candidate_by_name (conf, ab_pkg->name);
-  if (pkg) {
-    i = 0;
-    while (i < pkg->depends_count)
-      printf ("\tdepends on - %s\n", pkg->depends_str [i ++]);	
-  }
+	hash_table_foreach(&conf->pkg_hash, pkg_hash_fetch_available_helper,
+			   all);
 }
-void pkg_hash_dump(hash_table_t *hash, void *data)
+
+static void
+pkg_hash_fetch_all_installed_helper(const char *pkg_name, void *entry,
+				    void *data)
 {
+	abstract_pkg_t *ab_pkg = (abstract_pkg_t *) entry;
+	pkg_vec_t *all = (pkg_vec_t *) data;
+	pkg_vec_t *pkg_vec = ab_pkg->pkgs;
+	int j;
+
+	if (!pkg_vec)
+		return;
+
+	for (j = 0; j < pkg_vec->len; j++) {
+		pkg_t *pkg = pkg_vec->pkgs[j];
+		if (pkg->state_status == SS_INSTALLED
+		    || pkg->state_status == SS_UNPACKED)
+			pkg_vec_insert(all, pkg);
+	}
+}
 
-  printf ("\n\n+=+%s+=+\n\n", __FUNCTION__);
-  hash_table_foreach(hash, pkg_hash_dump_helper, data);
-  printf ("\n+=+%s+=+\n\n", __FUNCTION__);    
+void pkg_hash_fetch_all_installed(pkg_vec_t * all)
+{
+	hash_table_foreach(&conf->pkg_hash, pkg_hash_fetch_all_installed_helper,
+			   all);
 }
 
-abstract_pkg_t * ensure_abstract_pkg_by_name(hash_table_t * hash, const char * pkg_name)
+/*
+ * This assumes that the abstract pkg doesn't exist.
+ */
+static abstract_pkg_t *add_new_abstract_pkg_by_name(const char *pkg_name)
 {
-  abstract_pkg_t * ab_pkg;
+	abstract_pkg_t *ab_pkg;
+
+	ab_pkg = abstract_pkg_new();
 
-  if(!(ab_pkg = abstract_pkg_fetch_by_name(hash, pkg_name)))
-    ab_pkg = add_new_abstract_pkg_by_name(hash, pkg_name);
+	ab_pkg->name = xstrdup(pkg_name);
+	hash_table_insert(&conf->pkg_hash, pkg_name, ab_pkg);
 
-  return ab_pkg;
+	return ab_pkg;
 }
 
-pkg_t *hash_insert_pkg(hash_table_t *hash, pkg_t *pkg, int set_status,opkg_conf_t *conf)
+abstract_pkg_t *ensure_abstract_pkg_by_name(const char *pkg_name)
 {
-     abstract_pkg_t * ab_pkg;
-     int arch_priority;
-
-     if(!pkg)
-	  return pkg;
-
-     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;
-     }
-     ab_pkg = ensure_abstract_pkg_by_name(hash, pkg->name);
-
-     if (set_status) {
-	  if (pkg->state_status == SS_INSTALLED) {
-	       ab_pkg->state_status = SS_INSTALLED;
-	  } else if (pkg->state_status == SS_UNPACKED) {
-	       ab_pkg->state_status = SS_UNPACKED;
-	  }
-     }
-
-     if(!ab_pkg->pkgs)
-	  ab_pkg->pkgs = pkg_vec_alloc();
-    
-     /* 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;
+	abstract_pkg_t *ab_pkg;
+
+	if (!(ab_pkg = abstract_pkg_fetch_by_name(pkg_name)))
+		ab_pkg = add_new_abstract_pkg_by_name(pkg_name);
+
+	return ab_pkg;
 }
 
-/*
- * this will assume that we've already determined that
- * the abstract pkg doesn't exist, 'cause we should know these things...
- */
-static abstract_pkg_t * add_new_abstract_pkg_by_name(hash_table_t * hash, const char * pkg_name)
+void hash_insert_pkg(pkg_t * pkg, int set_status)
 {
-  abstract_pkg_t * ab_pkg;
+	abstract_pkg_t *ab_pkg;
 
-  ab_pkg = abstract_pkg_new();
-  if (ab_pkg == NULL) { return NULL; }
+	ab_pkg = ensure_abstract_pkg_by_name(pkg->name);
+	if (!ab_pkg->pkgs)
+		ab_pkg->pkgs = pkg_vec_alloc();
 
-  ab_pkg->name = strdup(pkg_name);
-  hash_table_insert(hash, pkg_name, ab_pkg);
+	if (pkg->state_status == SS_INSTALLED) {
+		ab_pkg->state_status = SS_INSTALLED;
+	} else if (pkg->state_status == SS_UNPACKED) {
+		ab_pkg->state_status = SS_UNPACKED;
+	}
 
-  return ab_pkg;
-}
+	buildDepends(pkg);
+
+	buildProvides(ab_pkg, pkg);
+
+	init_providelist(pkg, NULL);
+
+	/* Need to build the conflicts graph before replaces for correct
+	 * calculation of replaced_by relation.
+	 */
+	buildConflicts(pkg);
 
+	buildReplaces(ab_pkg, pkg);
 
-pkg_t *file_hash_get_file_owner(opkg_conf_t *conf, const char *file_name)
+	buildDependedUponBy(pkg, ab_pkg);
+
+	pkg_vec_insert_merge(ab_pkg->pkgs, pkg, set_status);
+	pkg->parent = ab_pkg;
+}
+
+static const char *strip_offline_root(const char *file_name)
 {
-     hash_table_t *file_hash = &conf->file_hash;
+	unsigned int len;
+
+	if (conf->offline_root) {
+		len = strlen(conf->offline_root);
+		if (strncmp(file_name, conf->offline_root, len) == 0)
+			file_name += len;
+	}
 
-     return hash_table_get(file_hash, file_name); 
+	return file_name;
 }
 
-int file_hash_set_file_owner(opkg_conf_t *conf, const char *file_name, pkg_t *owning_pkg)
+void file_hash_remove(const char *file_name)
 {
-     hash_table_t *file_hash = &conf->file_hash;
-     pkg_t *old_owning_pkg = hash_table_get(file_hash, file_name);
-     int file_name_len = strlen(file_name);
-
-     if (file_name[file_name_len -1] == '/')
-	  return 0;
-
-     if (conf->offline_root) {
-	  int len = strlen(conf->offline_root);
-	  if (strncmp(file_name, conf->offline_root, len) == 0) {
-	       file_name += len;
-	  }
-     }
-
-     // opkg_message(conf, OPKG_DEBUG2, "owning_pkg=%s filename=%s\n", owning_pkg->name, file_name);
-     hash_table_insert(file_hash, file_name, owning_pkg); 
-     if (old_owning_pkg) {
-	  str_list_remove_elt(old_owning_pkg->installed_files, file_name);
-	  /* mark this package to have its filelist written */
-	  old_owning_pkg->state_flag |= SF_FILELIST_CHANGED;
-	  owning_pkg->state_flag |= SF_FILELIST_CHANGED;
-     }
-     return 0;
+	file_name = strip_offline_root(file_name);
+	hash_table_remove(&conf->file_hash, file_name);
 }
 
+pkg_t *file_hash_get_file_owner(const char *file_name)
+{
+	file_name = strip_offline_root(file_name);
+	return hash_table_get(&conf->file_hash, file_name);
+}
 
+void file_hash_set_file_owner(const char *file_name, pkg_t * owning_pkg)
+{
+	pkg_t *old_owning_pkg;
+	int file_name_len = strlen(file_name);
+
+	if (file_name[file_name_len - 1] == '/')
+		return;
+
+	file_name = strip_offline_root(file_name);
+
+	old_owning_pkg = hash_table_get(&conf->file_hash, file_name);
+	hash_table_insert(&conf->file_hash, file_name, owning_pkg);
+
+	if (old_owning_pkg) {
+		pkg_get_installed_files(old_owning_pkg);
+		str_list_remove_elt(old_owning_pkg->installed_files, file_name);
+		pkg_free_installed_files(old_owning_pkg);
+
+		/* mark this package to have its filelist written */
+		old_owning_pkg->state_flag |= SF_FILELIST_CHANGED;
+		owning_pkg->state_flag |= SF_FILELIST_CHANGED;
+	}
+}