X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=blobdiff_plain;f=libopkg%2Fopkg.c;h=0dff32b3b62d2d1dfa6425c808ab1b8dcf5e1c61;hp=30bde2ef401248d632c99c1246465d6177b0c18f;hb=da40af11f7cdf54b484c8aae73d6201694e6c234;hpb=4b1f75293bdff6372cf3e390d7875fd66c8afc01

diff --git a/libopkg/opkg.c b/libopkg/opkg.c
index 30bde2e..0dff32b 100644
--- a/libopkg/opkg.c
+++ b/libopkg/opkg.c
@@ -26,12 +26,16 @@
 #include "opkg_configure.h"
 #include "opkg_download.h"
 #include "opkg_remove.h"
+#include "opkg_upgrade.h"
+#include "opkg_error.h"
 
 #include "sprintf_alloc.h"
 #include "file_util.h"
 
 #include <libbb/libbb.h>
 
+struct errlist* error_list;
+
 struct _opkg_t
 {
   args_t *args;
@@ -43,10 +47,39 @@ struct _opkg_t
     printf ("opkg: file %s: line %d (%s): Assertation '%s' failed",\
             __FILE__, __LINE__, __PRETTY_FUNCTION__, # expr); abort (); }
 
-#define progress(percent) if (progress_callback) progress_callback (opkg, percent, user_data);
+#define progress(d, p) d.percentage = p; if (progress_callback) progress_callback (opkg, &d, user_data);
+#define SSTRCMP(x,y) (x && y) ? strcmp (x, y) : 0
 
 /** Private Functions ***/
 
+/**
+ * Clone a pkg_t 
+ */ 
+static opkg_package_t*
+pkg_t_to_opkg_package_t (pkg_t *old)
+{
+  opkg_package_t *new;
+
+  new = opkg_package_new ();
+
+#define sstrdup(x) (x) ? strdup (x) : NULL;
+
+  new->name = sstrdup (old->name);
+  new->version = pkg_version_str_alloc (old);
+  new->architecture = sstrdup (old->architecture);
+  if (old->src)
+    new->repository = sstrdup (old->src->name);
+  new->description = sstrdup (old->description);
+  new->tags = sstrdup (old->tags);
+  new->url = sstrdup (old->url);
+
+#undef sstrdup
+
+  new->size = (old->size) ? atoi (old->size) : 0;
+  new->installed = (old->state_status == SS_INSTALLED);
+
+  return new;
+}
 
 static int
 opkg_configure_packages(opkg_conf_t *conf, char *pkg_name)
@@ -90,6 +123,7 @@ opkg_configure_packages(opkg_conf_t *conf, char *pkg_name)
 struct _curl_cb_data
 {
   opkg_progress_callback_t cb;
+  opkg_progress_data_t *progress_data;
   opkg_t *opkg;
   void *user_data;
   int start_range;
@@ -105,6 +139,7 @@ curl_progress_cb (struct _curl_cb_data *cb_data,
 {
   int p = (t) ? d * 100 / t : 0;
   static int prev = -1;
+  int progress = 0;
 
   /* prevent the same value being sent twice (can occur due to rounding) */
   if (p == prev)
@@ -114,8 +149,11 @@ curl_progress_cb (struct _curl_cb_data *cb_data,
   if (t < 1)
     return 0;
 
+  progress = cb_data->start_range + (d / t * ((cb_data->finish_range - cb_data->start_range)));
+  cb_data->progress_data->percentage = progress;
+
   (cb_data->cb)(cb_data->opkg,
-                cb_data->start_range + (d / t * ((cb_data->finish_range - cb_data->start_range))),
+                cb_data->progress_data,
                 cb_data->user_data);
 
   return 0;
@@ -124,17 +162,57 @@ curl_progress_cb (struct _curl_cb_data *cb_data,
 
 /*** Public API ***/
 
+opkg_package_t *
+opkg_package_new ()
+{
+
+  opkg_package_t *p;
+
+  p = calloc (1, sizeof (opkg_package_t));
+
+  return p;
+}
+
+void
+opkg_package_free (opkg_package_t *p)
+{
+  free (p->name);
+  free (p->version);
+  free (p->architecture);
+  free (p->description);
+  free (p->tags);
+  free (p->url);
+  free (p->repository);
+
+  free (p);
+}
+
 opkg_t *
 opkg_new ()
 {
   opkg_t *opkg;
-  opkg = malloc (sizeof (opkg_t));
+  int err;
 
-  opkg->args = malloc (sizeof (args_t));
-  args_init (opkg->args);
+  opkg = calloc (1, sizeof (opkg_t));
 
-  opkg->conf = malloc (sizeof (opkg_conf_t));
-  opkg_conf_init (opkg->conf, opkg->args);
+  opkg->args = calloc (1, sizeof (args_t));
+  err = args_init (opkg->args);
+  if (err)
+  {
+    free (opkg->args);
+    free (opkg);
+    return NULL;
+  }
+
+  opkg->conf = calloc (1, sizeof (opkg_conf_t));
+  err = opkg_conf_init (opkg->conf, opkg->args);
+  if (err)
+  {
+    free (opkg->conf);
+    free (opkg->args);
+    free (opkg);
+    return NULL;
+  }
 
   opkg_init_options_array (opkg->conf, &opkg->options);
   return opkg;
@@ -147,10 +225,14 @@ opkg_free (opkg_t *opkg)
 
   opkg_conf_deinit (opkg->conf);
   args_deinit (opkg->args);
+  free (opkg->options);
+  free (opkg->args);
+  free (opkg->conf);
+  free (opkg);
 }
 
 int
-opkg_read_config_files (opkg_t *opkg)
+opkg_re_read_config_files (opkg_t *opkg)
 {
   args_t *a;
   opkg_conf_t *c;
@@ -175,7 +257,6 @@ opkg_read_config_files (opkg_t *opkg)
   a->nodeps = c->nodeps;
   a->noaction = c->noaction;
   a->query_all = c->query_all;
-  a->multiple_providers = c->multiple_providers;
   a->verbosity = c->verbosity;
 
   if (c->offline_root)
@@ -196,6 +277,12 @@ opkg_read_config_files (opkg_t *opkg)
     a->offline_root_post_script_cmd = strdup (c->offline_root_post_script_cmd);
   }
 
+  if (c->cache) {
+    if (a->cache)
+	free (a->cache);
+    a->cache = strdup(c->cache);
+  }
+
   /* throw away old opkg_conf and start again */
   opkg_conf_deinit (opkg->conf);
   opkg_conf_init (opkg->conf, opkg->args);
@@ -251,7 +338,7 @@ opkg_get_option (opkg_t *opkg, char *option, void **value)
 void
 opkg_set_option (opkg_t *opkg, char *option, void *value)
 {
-  int i = 0;
+  int i = 0, found = 0;
   opkg_option_t *options;
 
   opkg_assert (opkg != NULL);
@@ -267,11 +354,18 @@ opkg_set_option (opkg_t *opkg, char *option, void *value)
   {
     if (strcmp (options[i].name, option) == 0)
     {
+      found = 1;
       break;
     }
     i++;
   }
 
+  if (!found)
+  {
+    /* XXX: Warning: Option not found */
+    return;
+  }
+
   /* set the option */
   switch (options[i].type)
   {
@@ -293,90 +387,205 @@ opkg_set_option (opkg_t *opkg, char *option, void *value)
 
 }
 
+/**
+ * @brief libopkg API: Install package
+ * @param opkg Then opkg handler
+ * @param package_name The name of package in which is going to install
+ * @param progress_callback The callback function that report the status to caller. 
+ */ 
 int
 opkg_install_package (opkg_t *opkg, const char *package_name, opkg_progress_callback_t progress_callback, void *user_data)
 {
   int err;
-  char *package_id = NULL;
+  char *stripped_filename;
+  opkg_progress_data_t pdata;
+  pkg_t *old, *new;
+  pkg_vec_t *deps, *all;
+  int i, ndepends;
+  char **unresolved = NULL;
 
   opkg_assert (opkg != NULL);
   opkg_assert (package_name != NULL);
 
-  progress (0);
+  /* ... */
+  pkg_info_preinstall_check (opkg->conf);
 
-  /* download the package */
-  opkg_prepare_url_for_install (opkg->conf, package_name, &package_id);
 
-  progress (50);
+  /* check to ensure package is not already installed */
+  old = pkg_hash_fetch_installed_by_name(&opkg->conf->pkg_hash, package_name);
+  if (old)
+  {
+    /* XXX: Error: Package is already installed. */
+    return OPKG_PACKAGE_ALREADY_INSTALLED;
+  }
 
-  /* ... */
-  pkg_info_preinstall_check (opkg->conf);
+  new = pkg_hash_fetch_best_installation_candidate_by_name(opkg->conf, package_name, NULL);
+  if (!new)
+  {
+    /* XXX: Error: Could not find package to install */
+    return OPKG_PACKAGE_NOT_FOUND;
+  }
 
-  if (!package_id)
-    package_id = strdup (package_name);
+  new->state_flag |= SF_USER;
 
-  /* unpack the package */
-  if (opkg->conf->multiple_providers)
+  pdata.action = OPKG_INSTALL;
+  pdata.package = pkg_t_to_opkg_package_t (new);
+
+  progress (pdata, 0);
+
+  /* find dependancies and download them */
+  deps = pkg_vec_alloc ();
+  /* this function does not return the original package, so we insert it later */
+  ndepends = pkg_hash_fetch_unsatisfied_dependencies (opkg->conf, new, deps, &unresolved);
+  if (unresolved)
   {
-    err = opkg_install_multi_by_name (opkg->conf, package_id);
+    /* XXX: Error: Could not satisfy dependencies */
+    pkg_vec_free (deps);
+    return OPKG_DEPENDENCIES_FAILED;
   }
-  else
+
+  /* insert the package we are installing so that we download it */
+  pkg_vec_insert (deps, new);
+
+  /* download package and dependancies */
+  for (i = 0; i < deps->len; i++)
   {
-    err = opkg_install_by_name (opkg->conf, package_id);
+    pkg_t *pkg;
+    struct _curl_cb_data cb_data;
+    char *url;
+
+    pkg = deps->pkgs[i];
+    if (pkg->local_filename)
+      continue;
+
+    opkg_package_free (pdata.package);
+    pdata.package = pkg_t_to_opkg_package_t (pkg);
+    pdata.action = OPKG_DOWNLOAD;
+
+    if (pkg->src == NULL)
+    {
+      /* XXX: Error: Package not available from any configured src */
+      return OPKG_PACKAGE_NOT_AVAILABLE;
+    }
+
+    sprintf_alloc(&url, "%s/%s", pkg->src->value, pkg->filename);
+
+    /* Get the filename part, without any directory */
+    stripped_filename = strrchr(pkg->filename, '/');
+    if ( ! stripped_filename )
+        stripped_filename = pkg->filename;
+
+    sprintf_alloc(&pkg->local_filename, "%s/%s", opkg->conf->tmp_dir, stripped_filename);
+
+    cb_data.cb = progress_callback;
+    cb_data.progress_data = &pdata;
+    cb_data.opkg = opkg;
+    cb_data.user_data = user_data;
+    /* 75% of "install" progress is for downloading */
+    cb_data.start_range = 75 * i / deps->len;
+    cb_data.finish_range = 75 * (i + 1) / deps->len;
+
+    err = opkg_download(opkg->conf, url, pkg->local_filename,
+              (curl_progress_func) curl_progress_cb, &cb_data);
+    free(url);
+
+    if (err)
+    {
+      pkg_vec_free (deps);
+      opkg_package_free (pdata.package);
+      return OPKG_DOWNLOAD_FAILED;
+    }
+
+  }
+  pkg_vec_free (deps);
+
+  /* clear depenacy checked marks, left by pkg_hash_fetch_unsatisfied_dependencies */
+  all = pkg_vec_alloc ();
+  pkg_hash_fetch_available (&opkg->conf->pkg_hash, all);
+  for (i = 0; i < all->len; i++)
+  {
+    all->pkgs[i]->parent->dependencies_checked = 0;
   }
+  pkg_vec_free (all);
+
+
+  /* 75% of "install" progress is for downloading */
+  opkg_package_free (pdata.package);
+  pdata.package = pkg_t_to_opkg_package_t (new);
+  pdata.action = OPKG_INSTALL;
+  progress (pdata, 75);
+
+  /* unpack the package */
+  err = opkg_install_pkg(opkg->conf, new, 0);
 
   if (err)
-    return err;
+  {
+    opkg_package_free (pdata.package);
+    switch (err)
+    {
+      case OPKG_INSTALL_ERR_NOT_TRUSTED: return OPKG_GPG_ERROR;
+      case OPKG_INSTALL_ERR_DOWNLOAD: return OPKG_DOWNLOAD_FAILED;
+      case OPKG_INSTALL_ERR_DEPENDENCIES:
+      case OPKG_INSTALL_ERR_CONFLICTS: return OPKG_DEPENDENCIES_FAILED;
+      case OPKG_INSTALL_ERR_ALREADY_INSTALLED: return OPKG_PACKAGE_ALREADY_INSTALLED;
+      case OPKG_INSTALL_ERR_SIGNATURE: return OPKG_GPG_ERROR;
+      case OPKG_INSTALL_ERR_MD5: return OPKG_MD5_ERROR;
+      default: return OPKG_UNKNOWN_ERROR;
+    }
+  }
 
-  progress (75);
+  progress (pdata, 75);
 
   /* run configure scripts, etc. */
   err = opkg_configure_packages (opkg->conf, NULL);
   if (err)
-    return err;
+  {
+    opkg_package_free (pdata.package);
+    return OPKG_UNKNOWN_ERROR;
+  }
 
   /* write out status files and file lists */
   opkg_conf_write_status_files (opkg->conf);
   pkg_write_changed_filelists (opkg->conf);
 
-  progress (100);
+  progress (pdata, 100);
+  opkg_package_free (pdata.package);
   return 0;
 }
 
 int
 opkg_remove_package (opkg_t *opkg, const char *package_name, opkg_progress_callback_t progress_callback, void *user_data)
 {
+  int err;
   pkg_t *pkg = NULL;
   pkg_t *pkg_to_remove;
+  opkg_progress_data_t pdata;
 
   opkg_assert (opkg != NULL);
   opkg_assert (package_name != NULL);
 
-  progress (0);
-
   pkg_info_preinstall_check (opkg->conf);
 
-  pkg_vec_t *installed_pkgs = pkg_vec_alloc ();
-
-  pkg_hash_fetch_all_installed (&opkg->conf->pkg_hash, installed_pkgs);
-
-  progress (25);
-
   pkg = pkg_hash_fetch_installed_by_name (&opkg->conf->pkg_hash, package_name);
 
   if (pkg == NULL)
   {
     /* XXX: Error: Package not installed. */
-    return 1;
+    return OPKG_PACKAGE_NOT_INSTALLED;
   }
 
+  pdata.action = OPKG_REMOVE;
+  pdata.package = pkg_t_to_opkg_package_t (pkg);
+  progress (pdata, 0);
+
+
   if (pkg->state_status == SS_NOT_INSTALLED)
   {
     /* XXX:  Error: Package seems to be not installed (STATUS = NOT_INSTALLED). */
-    return 1;
+    opkg_package_free (pdata.package);
+    return OPKG_PACKAGE_NOT_INSTALLED;
   }
-
-  progress (75);
+  progress (pdata, 25);
 
   if (opkg->conf->restrict_to_default_dest)
   {
@@ -390,29 +599,32 @@ opkg_remove_package (opkg_t *opkg, const char *package_name, opkg_progress_callb
   }
 
 
-  progress (75);
+  progress (pdata, 75);
 
-  opkg_remove_pkg (opkg->conf, pkg_to_remove, 0);
+  err = opkg_remove_pkg (opkg->conf, pkg_to_remove, 0);
 
   /* write out status files and file lists */
   opkg_conf_write_status_files (opkg->conf);
   pkg_write_changed_filelists (opkg->conf);
 
 
-  progress (100);
-  return 0;
+  progress (pdata, 100);
+  opkg_package_free (pdata.package);
+  return (err) ? OPKG_UNKNOWN_ERROR : OPKG_NO_ERROR;
 }
 
 int
 opkg_upgrade_package (opkg_t *opkg, const char *package_name, opkg_progress_callback_t progress_callback, void *user_data)
 {
+  int err;
   pkg_t *pkg;
+  opkg_progress_data_t pdata;
+
+
 
   opkg_assert (opkg != NULL);
   opkg_assert (package_name != NULL);
 
-  progress (0);
-
   pkg_info_preinstall_check (opkg->conf);
 
   if (opkg->conf->restrict_to_default_dest)
@@ -423,7 +635,7 @@ opkg_upgrade_package (opkg_t *opkg, const char *package_name, opkg_progress_call
     if (pkg == NULL)
     {
       /* XXX: Error: Package not installed in default_dest */
-      return 1;
+      return OPKG_PACKAGE_NOT_INSTALLED;
     }
   }
   else
@@ -435,16 +647,45 @@ opkg_upgrade_package (opkg_t *opkg, const char *package_name, opkg_progress_call
   if (!pkg)
   {
     /* XXX: Error: Package not installed */
-    return 1;
+    return OPKG_PACKAGE_NOT_INSTALLED;
   }
 
-  progress (25);
+  pdata.action = OPKG_INSTALL;
+  pdata.package = pkg_t_to_opkg_package_t (pkg);
+  progress (pdata, 0);
+
+  err = opkg_upgrade_pkg (opkg->conf, pkg);
+  /* opkg_upgrade_pkg returns the error codes of opkg_install_pkg */
+  if (err)
+  {
 
-  opkg_upgrade_pkg (opkg->conf, pkg);
-  progress (75);
+    opkg_package_free (pdata.package);
+    switch (err)
+    {
+      case OPKG_INSTALL_ERR_NOT_TRUSTED: return OPKG_GPG_ERROR;
+      case OPKG_INSTALL_ERR_DOWNLOAD: return OPKG_DOWNLOAD_FAILED;
+      case OPKG_INSTALL_ERR_DEPENDENCIES:
+      case OPKG_INSTALL_ERR_CONFLICTS: return OPKG_DEPENDENCIES_FAILED;
+      case OPKG_INSTALL_ERR_ALREADY_INSTALLED: return OPKG_PACKAGE_ALREADY_INSTALLED;
+      case OPKG_INSTALL_ERR_SIGNATURE: return OPKG_GPG_ERROR;
+      case OPKG_INSTALL_ERR_MD5: return OPKG_MD5_ERROR;
+      default: return OPKG_UNKNOWN_ERROR;
+    }
+  }
+  progress (pdata, 75);
 
-  opkg_configure_packages (opkg->conf, NULL);
-  progress (100);
+  err = opkg_configure_packages (opkg->conf, NULL);
+  if (err) {
+    opkg_package_free (pdata.package);  
+    return OPKG_UNKNOWN_ERROR;
+  }
+
+  /* write out status files and file lists */
+  opkg_conf_write_status_files (opkg->conf);
+  pkg_write_changed_filelists (opkg->conf);
+
+  progress (pdata, 100);
+  opkg_package_free (pdata.package);
   return 0;
 }
 
@@ -455,9 +696,13 @@ opkg_upgrade_all (opkg_t *opkg, opkg_progress_callback_t progress_callback, void
   int err = 0;
   int i;
   pkg_t *pkg;
+  opkg_progress_data_t pdata;
+
+  pdata.action = OPKG_INSTALL;
+  pdata.package = NULL;
 
   opkg_assert (opkg != NULL);
-  progress (0);
+  progress (pdata, 0);
 
   installed = pkg_vec_alloc ();
   pkg_info_preinstall_check (opkg->conf);
@@ -466,8 +711,12 @@ opkg_upgrade_all (opkg_t *opkg, opkg_progress_callback_t progress_callback, void
   for (i = 0; i < installed->len; i++)
   {
     pkg = installed->pkgs[i];
+
+    pdata.package = pkg_t_to_opkg_package_t (pkg);
+    progress (pdata, 99 * i / installed->len);
+    opkg_package_free (pdata.package);
+
     err += opkg_upgrade_pkg (opkg->conf, pkg);
-    progress (100 * i / installed->len);
   }
   pkg_vec_free (installed);
 
@@ -478,7 +727,8 @@ opkg_upgrade_all (opkg_t *opkg, opkg_progress_callback_t progress_callback, void
   if (err)
     return 1;
 
-  progress (100);
+  pdata.package = NULL;
+  progress (pdata, 100);
   return 0;
 }
 
@@ -486,15 +736,18 @@ int
 opkg_update_package_lists (opkg_t *opkg, opkg_progress_callback_t progress_callback, void *user_data)
 {
   char *tmp;
-  int err;
+  int err, result = 0;
   char *lists_dir;
   pkg_src_list_elt_t *iter;
   pkg_src_t *src;
   int sources_list_count, sources_done;
+  opkg_progress_data_t pdata;
 
   opkg_assert (opkg != NULL);
 
-  progress (0);
+  pdata.action = OPKG_DOWNLOAD;
+  pdata.package = NULL;
+  progress (pdata, 0);
 
   sprintf_alloc (&lists_dir, "%s",
                  (opkg->conf->restrict_to_default_dest)
@@ -529,7 +782,7 @@ opkg_update_package_lists (opkg_t *opkg, opkg_progress_callback_t progress_callb
     return 1;
   }
 
-  /* cout the number of sources so we can give some progress updates */
+  /* count the number of sources so we can give some progress updates */
   sources_list_count = 0;
   sources_done = 0;
   iter = opkg->conf->pkg_src_list.head;
@@ -541,7 +794,7 @@ opkg_update_package_lists (opkg_t *opkg, opkg_progress_callback_t progress_callb
 
   for (iter = opkg->conf->pkg_src_list.head; iter; iter = iter->next)
   {
-    char *url, *list_file_name;
+    char *url, *list_file_name = NULL;
 
     src = iter->data;
 
@@ -554,15 +807,16 @@ opkg_update_package_lists (opkg_t *opkg, opkg_progress_callback_t progress_callb
     sprintf_alloc (&list_file_name, "%s/%s", lists_dir, src->name);
     if (src->gzip)
     {
-      char *tmp_file_name;
       FILE *in, *out;
       struct _curl_cb_data cb_data;
+      char *tmp_file_name = NULL;
 
       sprintf_alloc (&tmp_file_name, "%s/%s.gz", tmp, src->name);
 
       /* XXX: Note: downloading url */
 
       cb_data.cb = progress_callback;
+      cb_data.progress_data = &pdata;
       cb_data.opkg = opkg;
       cb_data.user_data = user_data;
       cb_data.start_range = 100 * sources_done / sources_list_count;
@@ -585,6 +839,7 @@ opkg_update_package_lists (opkg_t *opkg, opkg_progress_callback_t progress_callb
           fclose (out);
         unlink (tmp_file_name);
       }
+      free (tmp_file_name);
     }
     else
       err = opkg_download (opkg->conf, url, list_file_name, NULL, NULL);
@@ -592,10 +847,12 @@ opkg_update_package_lists (opkg_t *opkg, opkg_progress_callback_t progress_callb
     if (err)
     {
       /* XXX: Error: download error */
+      result = OPKG_DOWNLOAD_FAILED;
     }
     free (url);
 
 #ifdef HAVE_GPGME
+    char *sig_file_name;
     /* download detached signitures to verify the package lists */
     /* get the url for the sig file */
     if (src->extra_data)  /* debian style? */
@@ -604,12 +861,13 @@ opkg_update_package_lists (opkg_t *opkg, opkg_progress_callback_t progress_callb
     else
       sprintf_alloc (&url, "%s/%s", src->value, "Packages.sig");
 
-    /* create temporary file for it */
-    char *tmp_file_name;
+    /* create filename for signature */
+    sprintf_alloc (&sig_file_name, "%s/%s.sig", lists_dir, src->name);
 
-    sprintf_alloc (&tmp_file_name, "%s/%s", tmp, "Packages.sig");
+    /* make sure there is no existing signature file */
+    unlink (sig_file_name);
 
-    err = opkg_download (opkg->conf, url, tmp_file_name, NULL, NULL);
+    err = opkg_download (opkg->conf, url, sig_file_name, NULL, NULL);
     if (err)
     {
       /* XXX: Warning: Download failed */
@@ -617,7 +875,7 @@ opkg_update_package_lists (opkg_t *opkg, opkg_progress_callback_t progress_callb
     else
     {
       int err;
-      err = opkg_verify_file (opkg->conf, list_file_name, tmp_file_name);
+      err = opkg_verify_file (opkg->conf, list_file_name, sig_file_name);
       if (err == 0)
       {
         /* XXX: Notice: Signature check passed */
@@ -627,23 +885,202 @@ opkg_update_package_lists (opkg_t *opkg, opkg_progress_callback_t progress_callb
         /* XXX: Warning: Signature check failed */
       }
     }
-    unlink (tmp_file_name);
-    free (tmp_file_name);
+    free (sig_file_name);
+    free (list_file_name);
     free (url);
 #else
-    /* XXX: Note: Signiture check for %s skipped because GPG support was not
+    /* XXX: Note: Signature check for %s skipped because GPG support was not
      * enabled in this build
      */
 #endif
-    free (list_file_name);
 
     sources_done++;
-    progress (100 * sources_done / sources_list_count);
+    progress (pdata, 100 * sources_done / sources_list_count);
   }
 
   rmdir (tmp);
   free (tmp);
   free (lists_dir);
 
+  /* Now re-read the package lists to update package hash tables. */
+  opkg_re_read_config_files (opkg);
+
+  return result;
+}
+
+
+int
+opkg_list_packages (opkg_t *opkg, opkg_package_callback_t callback, void *user_data)
+{
+  pkg_vec_t *all;
+  int i;
+
+  opkg_assert (opkg);
+  opkg_assert (callback);
+
+  all = pkg_vec_alloc ();
+  pkg_hash_fetch_available (&opkg->conf->pkg_hash, all);
+  for (i = 0; i < all->len; i++)
+  {
+    pkg_t *pkg;
+    opkg_package_t *package;
+
+    pkg = all->pkgs[i];
+
+    package = pkg_t_to_opkg_package_t (pkg);
+    callback (opkg, package, user_data);
+    opkg_package_free (package);
+  }
+
+  pkg_vec_free (all);
+
   return 0;
 }
+
+int
+opkg_list_upgradable_packages (opkg_t *opkg, opkg_package_callback_t callback, void *user_data)
+{
+    struct active_list *head;
+    struct active_list *node;
+    pkg_t *old=NULL, *new = NULL;
+    static opkg_package_t* package=NULL;
+
+
+    opkg_assert (opkg);
+    opkg_assert (callback);
+
+    /* ensure all data is valid */
+    pkg_info_preinstall_check (opkg->conf);
+
+    head  =  prepare_upgrade_list(opkg->conf);
+    for (node=active_list_next(head, head); node; active_list_next(head,node)) {
+        old = list_entry(node, pkg_t, list);
+        new = pkg_hash_fetch_best_installation_candidate_by_name(opkg->conf, old->name, NULL);
+        package = pkg_t_to_opkg_package_t (new);
+        callback (opkg, package, user_data);
+        opkg_package_free (package);
+    }
+    active_list_head_delete(head);
+    return 0;
+}
+
+opkg_package_t*
+opkg_find_package (opkg_t *opkg, const char *name, const char *ver, const char *arch, const char *repo)
+{
+  pkg_vec_t *all;
+  opkg_package_t *package = NULL;
+  int i;
+#define sstrcmp(x,y) (x && y) ? strcmp (x, y) : 0
+
+  opkg_assert (opkg);
+
+  all = pkg_vec_alloc ();
+  pkg_hash_fetch_available (&opkg->conf->pkg_hash, all);
+  for (i = 0; i < all->len; i++)
+  {
+    pkg_t *pkg;
+    char *pkgv;
+
+    pkg = all->pkgs[i];
+
+    /* check name */
+    if (sstrcmp (pkg->name, name))
+      continue;
+    
+    /* check version */
+    pkgv = pkg_version_str_alloc (pkg);
+    if (sstrcmp (pkgv, ver))
+    {
+      free (pkgv);
+      continue;
+    }
+    free (pkgv);
+
+    /* check architecture */
+    if (arch)
+    {
+      if (sstrcmp (pkg->architecture, arch))
+        continue;
+    }
+
+    /* check repository */
+    if (repo)
+    {
+      if (sstrcmp (pkg->src->name, repo))
+          continue;
+    }
+
+    /* match found */
+    package = pkg_t_to_opkg_package_t (pkg);
+    break;
+  }
+
+  pkg_vec_free (all);
+
+  return package;
+}
+
+#include <curl/curl.h>
+/**
+ * @brief Check the accessibility of repositories. It will try to access the repository to check if the respository is accessible throught current network status. 
+ * @param opkg The opkg_t
+ * @return return how many repositories cannot access. 0 means all okay. 
+ */ 
+int opkg_repository_accessibility_check(opkg_t *opkg) 
+{
+  pkg_src_list_elt_t *iter;
+  str_list_elt_t *iter1;
+  str_list_t *src;
+  int repositories=0;
+  int ret=0;
+  int err;
+  char *repo_ptr;
+  char *stmp;
+  opkg_assert(opkg != NULL);
+
+  src = str_list_alloc();
+
+  for (iter = opkg->conf->pkg_src_list.head; iter; iter = iter->next) 
+  {
+    if (strstr(iter->data->value, "://") && 
+		    index(strstr(iter->data->value, "://") + 3, '/')) 
+      stmp = strndup(iter->data->value, 
+		      (index(strstr(iter->data->value, "://") + 3, '/') - iter->data->value)*sizeof(char));
+
+    else
+      stmp = strdup(iter->data->value);
+
+    for (iter1 = src->head; iter1; iter1 = iter1->next)
+    {
+      if (strstr(iter1->data, stmp)) 
+        break;
+    }
+    if (iter1)
+      continue;
+
+    sprintf_alloc(&repo_ptr, "%s/index.html",stmp);
+    free(stmp);
+
+    str_list_append(src, repo_ptr);
+    repositories++;
+  }
+  while (repositories > 0) 
+  {
+    iter1 = str_list_pop(src);
+    repositories--;
+
+    err = opkg_download(opkg->conf, iter1->data, "/dev/null", NULL, NULL);
+    if (!(err == CURLE_OK || 
+		err == CURLE_HTTP_RETURNED_ERROR || 
+		err == CURLE_FILE_COULDNT_READ_FILE ||
+		err == CURLE_REMOTE_FILE_NOT_FOUND || 
+		err == CURLE_TFTP_NOTFOUND
+		)) {
+	    ret++;
+    }
+    str_list_elt_deinit(iter1);
+    free(iter1);
+  }
+  free(src);
+  return ret;
+}