#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;
- opkg_conf_t *conf;
- opkg_option_t *options;
-};
+args_t *args;
#define opkg_assert(expr) if (!(expr)) { \
printf ("opkg: file %s: line %d (%s): Assertation '%s' failed",\
__FILE__, __LINE__, __PRETTY_FUNCTION__, # expr); abort (); }
-#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
+#define progress(d, p) d.percentage = p; if (progress_callback) progress_callback (&d, user_data);
/** 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)
+opkg_configure_packages(char *pkg_name)
{
pkg_vec_t *all;
int i;
int r, err = 0;
all = pkg_vec_alloc ();
- pkg_hash_fetch_available (&conf->pkg_hash, all);
+ pkg_hash_fetch_available (all);
for (i = 0; i < all->len; i++)
{
if (pkg->state_status == SS_UNPACKED)
{
- r = opkg_configure (conf, pkg);
+ r = opkg_configure (pkg);
if (r == 0)
{
pkg->state_status = SS_INSTALLED;
{
opkg_progress_callback_t cb;
opkg_progress_data_t *progress_data;
- opkg_t *opkg;
void *user_data;
int start_range;
int finish_range;
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->progress_data,
+ (cb_data->cb)(cb_data->progress_data,
cb_data->user_data);
return 0;
/*** 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 *
+int
opkg_new ()
{
- opkg_t *opkg;
int err;
- opkg = calloc (1, sizeof (opkg_t));
+ args = xcalloc(1, sizeof (args_t));
+ args_init (args);
- opkg->args = calloc (1, sizeof (args_t));
- err = args_init (opkg->args);
+ err = opkg_conf_init (args);
if (err)
{
- free (opkg->args);
- free (opkg);
- return NULL;
+ free (args);
+ return -1;
}
- 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;
+ return 0;
}
void
-opkg_free (opkg_t *opkg)
+opkg_free (void)
{
- opkg_assert (opkg != NULL);
-
- opkg_conf_deinit (opkg->conf);
- args_deinit (opkg->args);
- free (opkg->options);
- free (opkg->args);
- free (opkg->conf);
- free (opkg);
+#ifdef HAVE_CURL
+ opkg_curl_cleanup();
+#endif
+ opkg_conf_deinit ();
+ args_deinit (args);
+ free (args);
}
int
-opkg_re_read_config_files (opkg_t *opkg)
+opkg_re_read_config_files (void)
{
- args_t *a;
- opkg_conf_t *c;
-
- opkg_assert (opkg != NULL);
-
- a = opkg->args;
- c = opkg->conf;
-
- /* Unfortunatly, the easiest way to re-read the config files right now is to
- * throw away opkg->conf and start again */
-
- /* copy the settings we need to keep */
- a->autoremove = c->autoremove;
- a->force_depends = c->force_depends;
- a->force_defaults = c->force_defaults;
- a->force_overwrite = c->force_overwrite;
- a->force_downgrade = c->force_downgrade;
- a->force_reinstall = c->force_reinstall;
- a->force_removal_of_dependent_packages = c->force_removal_of_dependent_packages;
- a->force_removal_of_essential_packages = c->force_removal_of_essential_packages;
- a->nodeps = c->nodeps;
- a->noaction = c->noaction;
- a->query_all = c->query_all;
- a->verbosity = c->verbosity;
-
- if (c->offline_root)
- {
- if (a->offline_root) free (a->offline_root);
- a->offline_root = strdup (c->offline_root);
- }
-
- if (c->offline_root_pre_script_cmd)
- {
- if (a->offline_root_pre_script_cmd) free (a->offline_root_pre_script_cmd);
- a->offline_root_pre_script_cmd = strdup (c->offline_root_pre_script_cmd);
- }
-
- if (c->offline_root_post_script_cmd)
- {
- if (a->offline_root_post_script_cmd) free (a->offline_root_post_script_cmd);
- 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);
-
- free (opkg->options);
- opkg_init_options_array (opkg->conf, &opkg->options);
-
- return 0;
+ /* Unfortunately, the easiest way to re-read the config files right now is to
+ * throw away conf and start again */
+ opkg_free();
+ memset(conf, '\0', sizeof(opkg_conf_t));
+ return opkg_new();
+ return 0;
}
void
-opkg_get_option (opkg_t *opkg, char *option, void **value)
+opkg_get_option (char *option, void **value)
{
int i = 0;
- opkg_option_t *options;
-
- opkg_assert (opkg != NULL);
- opkg_assert (option != NULL);
- opkg_assert (value != NULL);
-
- options = opkg->options;
+ extern opkg_option_t options[];
/* look up the option
* TODO: this would be much better as a hash table
return;
case OPKG_OPT_TYPE_STRING:
- *((char **)value) = strdup (options[i].value);
+ *((char **)value) = xstrdup(options[i].value);
return;
}
}
void
-opkg_set_option (opkg_t *opkg, char *option, void *value)
+opkg_set_option (char *option, void *value)
{
int i = 0, found = 0;
- opkg_option_t *options;
+ extern opkg_option_t options[];
- opkg_assert (opkg != NULL);
opkg_assert (option != NULL);
opkg_assert (value != NULL);
- options = opkg->options;
-
/* look up the option
* TODO: this would be much better as a hash table
*/
return;
case OPKG_OPT_TYPE_STRING:
- *((char **)options[i].value) = strdup (value);
+ *((char **)options[i].value) = xstrdup(value);
return;
}
/**
* @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)
+opkg_install_package (const char *package_name, opkg_progress_callback_t progress_callback, void *user_data)
{
int err;
char *stripped_filename;
int i, ndepends;
char **unresolved = NULL;
- opkg_assert (opkg != NULL);
opkg_assert (package_name != NULL);
/* ... */
- pkg_info_preinstall_check (opkg->conf);
+ pkg_info_preinstall_check ();
/* check to ensure package is not already installed */
- old = pkg_hash_fetch_installed_by_name(&opkg->conf->pkg_hash, package_name);
+ old = pkg_hash_fetch_installed_by_name(package_name);
if (old)
{
/* XXX: Error: Package is already installed. */
return OPKG_PACKAGE_ALREADY_INSTALLED;
}
- new = pkg_hash_fetch_best_installation_candidate_by_name(opkg->conf, package_name, NULL);
+ new = pkg_hash_fetch_best_installation_candidate_by_name(package_name);
if (!new)
{
/* XXX: Error: Could not find package to install */
new->state_flag |= SF_USER;
pdata.action = OPKG_INSTALL;
- pdata.package = pkg_t_to_opkg_package_t (new);
+ pdata.pkg = 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);
+ ndepends = pkg_hash_fetch_unsatisfied_dependencies (new, deps, &unresolved);
if (unresolved)
{
/* XXX: Error: Could not satisfy dependencies */
if (pkg->local_filename)
continue;
- opkg_package_free (pdata.package);
- pdata.package = pkg_t_to_opkg_package_t (pkg);
+ pdata.pkg = pkg;
pdata.action = OPKG_DOWNLOAD;
if (pkg->src == NULL)
if ( ! stripped_filename )
stripped_filename = pkg->filename;
- sprintf_alloc(&pkg->local_filename, "%s/%s", opkg->conf->tmp_dir, stripped_filename);
+ sprintf_alloc(&pkg->local_filename, "%s/%s", 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,
+ err = opkg_download(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;
}
/* clear depenacy checked marks, left by pkg_hash_fetch_unsatisfied_dependencies */
all = pkg_vec_alloc ();
- pkg_hash_fetch_available (&opkg->conf->pkg_hash, all);
+ pkg_hash_fetch_available (all);
for (i = 0; i < all->len; i++)
{
all->pkgs[i]->parent->dependencies_checked = 0;
/* 75% of "install" progress is for downloading */
- opkg_package_free (pdata.package);
- pdata.package = pkg_t_to_opkg_package_t (new);
+ pdata.pkg = new;
pdata.action = OPKG_INSTALL;
progress (pdata, 75);
/* unpack the package */
- err = opkg_install_pkg(opkg->conf, new, 0);
+ err = opkg_install_pkg(new, 0);
if (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;
- }
+ return OPKG_UNKNOWN_ERROR;
}
progress (pdata, 75);
/* run configure scripts, etc. */
- err = opkg_configure_packages (opkg->conf, NULL);
+ err = opkg_configure_packages (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);
+ opkg_conf_write_status_files ();
+ pkg_write_changed_filelists ();
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)
+opkg_remove_package (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);
- pkg_info_preinstall_check (opkg->conf);
+ pkg_info_preinstall_check ();
- pkg = pkg_hash_fetch_installed_by_name (&opkg->conf->pkg_hash, package_name);
+ pkg = pkg_hash_fetch_installed_by_name (package_name);
if (pkg == NULL)
{
}
pdata.action = OPKG_REMOVE;
- pdata.package = pkg_t_to_opkg_package_t (pkg);
+ pdata.pkg = pkg;
progress (pdata, 0);
if (pkg->state_status == SS_NOT_INSTALLED)
{
/* XXX: Error: Package seems to be not installed (STATUS = NOT_INSTALLED). */
- opkg_package_free (pdata.package);
return OPKG_PACKAGE_NOT_INSTALLED;
}
progress (pdata, 25);
- if (opkg->conf->restrict_to_default_dest)
+ if (conf->restrict_to_default_dest)
{
- pkg_to_remove = pkg_hash_fetch_installed_by_name_dest (&opkg->conf->pkg_hash,
- pkg->name,
- opkg->conf->default_dest);
+ pkg_to_remove = pkg_hash_fetch_installed_by_name_dest (pkg->name,
+ conf->default_dest);
}
else
{
- pkg_to_remove = pkg_hash_fetch_installed_by_name (&opkg->conf->pkg_hash, pkg->name );
+ pkg_to_remove = pkg_hash_fetch_installed_by_name (pkg->name);
}
progress (pdata, 75);
- err = opkg_remove_pkg (opkg->conf, pkg_to_remove, 0);
+ err = opkg_remove_pkg (pkg_to_remove, 0);
/* write out status files and file lists */
- opkg_conf_write_status_files (opkg->conf);
- pkg_write_changed_filelists (opkg->conf);
+ opkg_conf_write_status_files ();
+ pkg_write_changed_filelists ();
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)
+opkg_upgrade_package (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);
- pkg_info_preinstall_check (opkg->conf);
+ pkg_info_preinstall_check ();
- if (opkg->conf->restrict_to_default_dest)
+ if (conf->restrict_to_default_dest)
{
- pkg = pkg_hash_fetch_installed_by_name_dest (&opkg->conf->pkg_hash,
- package_name,
- opkg->conf->default_dest);
+ pkg = pkg_hash_fetch_installed_by_name_dest (package_name,
+ conf->default_dest);
if (pkg == NULL)
{
/* XXX: Error: Package not installed in default_dest */
}
else
{
- pkg = pkg_hash_fetch_installed_by_name (&opkg->conf->pkg_hash,
- package_name);
+ pkg = pkg_hash_fetch_installed_by_name (package_name);
}
if (!pkg)
}
pdata.action = OPKG_INSTALL;
- pdata.package = pkg_t_to_opkg_package_t (pkg);
+ pdata.pkg = pkg;
progress (pdata, 0);
- err = opkg_upgrade_pkg (opkg->conf, pkg);
+ err = opkg_upgrade_pkg (pkg);
/* opkg_upgrade_pkg returns the error codes of opkg_install_pkg */
if (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;
- }
+ return OPKG_UNKNOWN_ERROR;
}
progress (pdata, 75);
- err = opkg_configure_packages (opkg->conf, NULL);
+ err = opkg_configure_packages (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);
+ opkg_conf_write_status_files ();
+ pkg_write_changed_filelists ();
progress (pdata, 100);
- opkg_package_free (pdata.package);
return 0;
}
int
-opkg_upgrade_all (opkg_t *opkg, opkg_progress_callback_t progress_callback, void *user_data)
+opkg_upgrade_all (opkg_progress_callback_t progress_callback, void *user_data)
{
pkg_vec_t *installed;
int err = 0;
opkg_progress_data_t pdata;
pdata.action = OPKG_INSTALL;
- pdata.package = NULL;
+ pdata.pkg = NULL;
- opkg_assert (opkg != NULL);
progress (pdata, 0);
installed = pkg_vec_alloc ();
- pkg_info_preinstall_check (opkg->conf);
+ pkg_info_preinstall_check ();
- pkg_hash_fetch_all_installed (&opkg->conf->pkg_hash, installed);
+ pkg_hash_fetch_all_installed (installed);
for (i = 0; i < installed->len; i++)
{
pkg = installed->pkgs[i];
- pdata.package = pkg_t_to_opkg_package_t (pkg);
+ pdata.pkg = pkg;
progress (pdata, 99 * i / installed->len);
- opkg_package_free (pdata.package);
- err += opkg_upgrade_pkg (opkg->conf, pkg);
+ err += opkg_upgrade_pkg (pkg);
}
pkg_vec_free (installed);
if (err)
return 1;
- err = opkg_configure_packages (opkg->conf, NULL);
+ err = opkg_configure_packages (NULL);
if (err)
return 1;
- pdata.package = NULL;
+ pdata.pkg = NULL;
progress (pdata, 100);
return 0;
}
int
-opkg_update_package_lists (opkg_t *opkg, opkg_progress_callback_t progress_callback, void *user_data)
+opkg_update_package_lists (opkg_progress_callback_t progress_callback, void *user_data)
{
char *tmp;
int err, result = 0;
int sources_list_count, sources_done;
opkg_progress_data_t pdata;
- opkg_assert (opkg != NULL);
-
pdata.action = OPKG_DOWNLOAD;
- pdata.package = NULL;
+ pdata.pkg = NULL;
progress (pdata, 0);
sprintf_alloc (&lists_dir, "%s",
- (opkg->conf->restrict_to_default_dest)
- ? opkg->conf->default_dest->lists_dir
- : opkg->conf->lists_dir);
+ (conf->restrict_to_default_dest)
+ ? conf->default_dest->lists_dir
+ : conf->lists_dir);
if (!file_is_dir (lists_dir))
{
}
}
- tmp = strdup ("/tmp/opkg.XXXXXX");
-
- if (mkdtemp (tmp) == NULL)
- {
+ sprintf_alloc(&tmp, "%s/update-XXXXXX", conf->tmp_dir);
+ if (mkdtemp (tmp) == NULL) {
/* XXX: Error: could not create temporary file name */
free (lists_dir);
free (tmp);
/* 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;
- while (iter)
+ list_for_each_entry(iter, &conf->pkg_src_list.head, node)
{
sources_list_count++;
- iter = iter->next;
}
- for (iter = opkg->conf->pkg_src_list.head; iter; iter = iter->next)
+ list_for_each_entry(iter, &conf->pkg_src_list.head, node)
{
char *url, *list_file_name = NULL;
- src = iter->data;
+ src = (pkg_src_t *)iter->data;
if (src->extra_data) /* debian style? */
sprintf_alloc (&url, "%s/%s/%s", src->value, src->extra_data,
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;
cb_data.finish_range = 100 * (sources_done + 1) / sources_list_count;
- err = opkg_download (opkg->conf, url, tmp_file_name, (curl_progress_func) curl_progress_cb, &cb_data);
+ err = opkg_download (url, tmp_file_name, (curl_progress_func) curl_progress_cb, &cb_data);
if (err == 0)
{
free (tmp_file_name);
}
else
- err = opkg_download (opkg->conf, url, list_file_name, NULL, NULL);
+ err = opkg_download (url, list_file_name, NULL, NULL);
if (err)
{
}
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? */
- sprintf_alloc (&url, "%s/%s/%s", src->value, src->extra_data,
- "Packages.sig");
- else
- sprintf_alloc (&url, "%s/%s", src->value, "Packages.sig");
+#if defined(HAVE_GPGME) || defined(HAVE_OPENSSL)
+ if ( conf->check_signature ) {
+ 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? */
+ sprintf_alloc (&url, "%s/%s/%s", src->value, src->extra_data,
+ "Packages.sig");
+ else
+ sprintf_alloc (&url, "%s/%s", src->value, "Packages.sig");
- /* create filename for signature */
- sprintf_alloc (&sig_file_name, "%s/%s.sig", lists_dir, src->name);
+ /* create filename for signature */
+ sprintf_alloc (&sig_file_name, "%s/%s.sig", lists_dir, src->name);
- /* make sure there is no existing signature file */
- unlink (sig_file_name);
+ /* make sure there is no existing signature file */
+ unlink (sig_file_name);
- err = opkg_download (opkg->conf, url, sig_file_name, NULL, NULL);
- if (err)
- {
- /* XXX: Warning: Download failed */
- }
- else
- {
- int err;
- err = opkg_verify_file (opkg->conf, list_file_name, sig_file_name);
- if (err == 0)
- {
- /* XXX: Notice: Signature check passed */
- }
- else
- {
- /* XXX: Warning: Signature check failed */
- }
+ err = opkg_download (url, sig_file_name, NULL, NULL);
+ if (err)
+ {
+ /* XXX: Warning: Download failed */
+ }
+ else
+ {
+ int err;
+ err = opkg_verify_file (list_file_name, sig_file_name);
+ if (err == 0)
+ {
+ /* XXX: Notice: Signature check passed */
+ }
+ else
+ {
+ /* XXX: Warning: Signature check failed */
+ }
+ }
+ free (sig_file_name);
+ free (list_file_name);
+ free (url);
}
- free (sig_file_name);
- free (list_file_name);
- free (url);
#else
/* XXX: Note: Signature check for %s skipped because GPG support was not
* enabled in this build
free (lists_dir);
/* Now re-read the package lists to update package hash tables. */
- opkg_re_read_config_files (opkg);
+ opkg_re_read_config_files ();
return result;
}
int
-opkg_list_packages (opkg_t *opkg, opkg_package_callback_t callback, void *user_data)
+opkg_list_packages (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);
+ pkg_hash_fetch_available (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);
+ callback (pkg, user_data);
}
pkg_vec_free (all);
}
int
-opkg_list_upgradable_packages (opkg_t *opkg, opkg_package_callback_t callback, void *user_data)
+opkg_list_upgradable_packages (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);
+ pkg_info_preinstall_check ();
- head = prepare_upgrade_list(opkg->conf);
+ head = prepare_upgrade_list();
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);
+ new = pkg_hash_fetch_best_installation_candidate_by_name(old->name);
+ if (new == NULL)
+ continue;
+ callback (new, user_data);
}
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_t*
+opkg_find_package (const char *name, const char *ver, const char *arch, const char *repo)
{
+ pkg_t *pkg = NULL;
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);
+ pkg_hash_fetch_available (all);
for (i = 0; i < all->len; i++)
{
- pkg_t *pkg;
char *pkgv;
pkg = all->pkgs[i];
}
/* match found */
- package = pkg_t_to_opkg_package_t (pkg);
break;
}
pkg_vec_free (all);
- return package;
+ return pkg;
}
+#ifdef HAVE_CURL
#include <curl/curl.h>
+#endif
/**
* @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)
+int opkg_repository_accessibility_check(void)
{
pkg_src_list_elt_t *iter;
str_list_elt_t *iter1;
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)
+ list_for_each_entry(iter, &conf->pkg_src_list.head, node)
{
- 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));
+ if (strstr(((pkg_src_t *)iter->data)->value, "://") &&
+ index(strstr(((pkg_src_t *)iter->data)->value, "://") + 3, '/'))
+ stmp = xstrndup(((pkg_src_t *)iter->data)->value,
+ (index(strstr(((pkg_src_t *)iter->data)->value, "://") + 3, '/') - ((pkg_src_t *)iter->data)->value)*sizeof(char));
else
- stmp = strdup(iter->data->value);
+ stmp = xstrdup(((pkg_src_t *)iter->data)->value);
- for (iter1 = src->head; iter1; iter1 = iter1->next)
+ for (iter1 = str_list_first(src); iter1; iter1 = str_list_next(src, iter1))
{
if (strstr(iter1->data, stmp))
break;
free(stmp);
str_list_append(src, repo_ptr);
+ free(repo_ptr);
repositories++;
}
while (repositories > 0)
iter1 = str_list_pop(src);
repositories--;
- err = opkg_download(opkg->conf, iter1->data, "/dev/null", NULL, NULL);
+ err = opkg_download(iter1->data, "/dev/null", NULL, NULL);
+#ifdef HAVE_CURL
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
)) {
+#else
+ if (!(err == 0)) {
+#endif
ret++;
}
str_list_elt_deinit(iter1);
- free(iter1);
}
free(src);
return ret;