#include "opkg.h"
#include "opkg_conf.h"
-#include "args.h"
#include "opkg_install.h"
#include "opkg_configure.h"
#include <libbb/libbb.h>
-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 (); }
int
opkg_new()
{
- int err;
+ if (opkg_conf_init())
+ goto err0;
- args = xcalloc(1, sizeof(args_t));
- args_init(args);
+ if (pkg_hash_load_feeds())
+ goto err1;
- err = opkg_conf_init(args);
- if (err) {
- free(args);
- return -1;
- }
+ if (pkg_hash_load_status_files())
+ goto err1;
return 0;
+
+err1:
+ pkg_hash_deinit();
+err0:
+ opkg_conf_deinit();
+ return -1;
}
void
opkg_curl_cleanup();
#endif
opkg_conf_deinit();
- args_deinit(args);
- free(args);
}
int
opkg_re_read_config_files(void)
{
- /* 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();
+ pkg_hash_deinit();
+ pkg_hash_init();
+
+ if (pkg_hash_load_feeds())
+ goto err;
+
+ if (pkg_hash_load_status_files())
+ goto err;
+
return 0;
+
+err:
+ pkg_hash_deinit();
+ return -1;
}
void
}
if (!found) {
- /* XXX: Warning: Option not found */
+ opkg_msg(ERROR, "Invalid option: %s\n", option);
return;
}
/* check to ensure package is not already installed */
old = pkg_hash_fetch_installed_by_name(package_name);
if (old) {
- /* XXX: Error: Package is already installed. */
- return OPKG_PACKAGE_ALREADY_INSTALLED;
+ opkg_msg(ERROR, "Package %s is already installed\n",
+ package_name);
+ return -1;
}
new = pkg_hash_fetch_best_installation_candidate_by_name(package_name);
if (!new) {
- /* XXX: Error: Could not find package to install */
- return OPKG_PACKAGE_NOT_FOUND;
+ opkg_msg(ERROR, "Couldn't find package %s\n", package_name);
+ return -1;
}
new->state_flag |= SF_USER;
- pdata.action = OPKG_INSTALL;
+ pdata.action = -1;
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(new, deps, &unresolved);
+ ndepends = pkg_hash_fetch_unsatisfied_dependencies(new, deps,
+ &unresolved);
if (unresolved) {
- /* XXX: Error: Could not satisfy dependencies */
+ char **tmp = unresolved;
+ opkg_msg(ERROR, "Couldn't satisfy the following dependencies"
+ " for %s:\n", package_name);
+ while (*tmp) {
+ opkg_msg(ERROR, "\t%s", *tmp);
+ free(*tmp);
+ tmp++;
+ }
+ free(unresolved);
pkg_vec_free(deps);
- return OPKG_DEPENDENCIES_FAILED;
+ return -1;
}
/* insert the package we are installing so that we download it */
pkg_vec_insert(deps, new);
- /* download package and dependancies */
+ /* download package and dependencies */
for (i = 0; i < deps->len; i++) {
pkg_t *pkg;
struct _curl_cb_data cb_data;
pdata.action = OPKG_DOWNLOAD;
if (pkg->src == NULL) {
- /* XXX: Error: Package not available from any configured src */
- return OPKG_PACKAGE_NOT_AVAILABLE;
+ opkg_msg(ERROR, "Package %s not available from any "
+ "configured src\n", package_name);
+ return -1;
}
sprintf_alloc(&url, "%s/%s", pkg->src->value, pkg->filename);
if (err) {
pkg_vec_free(deps);
- return OPKG_DOWNLOAD_FAILED;
+ return -1;
}
}
err = opkg_install_pkg(new, 0);
if (err) {
- return OPKG_UNKNOWN_ERROR;
+ return -1;
}
progress(pdata, 75);
/* run configure scripts, etc. */
err = opkg_configure_packages(NULL);
if (err) {
- return OPKG_UNKNOWN_ERROR;
+ return -1;
}
/* write out status files and file lists */
pkg = pkg_hash_fetch_installed_by_name(package_name);
- if (pkg == NULL) {
- /* XXX: Error: Package not installed. */
- return OPKG_PACKAGE_NOT_INSTALLED;
+ if (pkg == NULL || pkg->state_status == SS_NOT_INSTALLED) {
+ opkg_msg(ERROR, "Package %s not installed\n", package_name);
+ return -1;
}
pdata.action = OPKG_REMOVE;
pdata.pkg = pkg;
progress(pdata, 0);
-
- if (pkg->state_status == SS_NOT_INSTALLED) {
- /* XXX: Error: Package seems to be not installed (STATUS = NOT_INSTALLED). */
- return OPKG_PACKAGE_NOT_INSTALLED;
- }
- progress(pdata, 25);
-
if (conf->restrict_to_default_dest) {
pkg_to_remove = pkg_hash_fetch_installed_by_name_dest(pkg->name,
conf->default_dest);
progress(pdata, 100);
- return (err) ? OPKG_UNKNOWN_ERROR : OPKG_NO_ERROR;
+ return (err) ? -1 : 0;
}
int
if (conf->restrict_to_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 */
- return OPKG_PACKAGE_NOT_INSTALLED;
- }
} else {
pkg = pkg_hash_fetch_installed_by_name(package_name);
}
if (!pkg) {
- /* XXX: Error: Package not installed */
- return OPKG_PACKAGE_NOT_INSTALLED;
+ opkg_msg(ERROR, "Package %s not installed\n", package_name);
+ return -1;
}
pdata.action = OPKG_INSTALL;
progress(pdata, 0);
err = opkg_upgrade_pkg(pkg);
- /* opkg_upgrade_pkg returns the error codes of opkg_install_pkg */
if (err) {
- return OPKG_UNKNOWN_ERROR;
+ return -1;
}
progress(pdata, 75);
err = opkg_configure_packages(NULL);
if (err) {
- return OPKG_UNKNOWN_ERROR;
+ return -1;
}
/* write out status files and file lists */
if (!file_is_dir(lists_dir)) {
if (file_exists(lists_dir)) {
- /* XXX: Error: file exists but is not a directory */
+ opkg_msg(ERROR, "%s is not a directory\n", lists_dir);
free(lists_dir);
return 1;
}
err = file_mkdir_hier(lists_dir, 0755);
if (err) {
- /* XXX: Error: failed to create directory */
+ opkg_msg(ERROR, "Couldn't create lists_dir %s\n",
+ lists_dir);
free(lists_dir);
return 1;
}
sprintf_alloc(&tmp, "%s/update-XXXXXX", conf->tmp_dir);
if (mkdtemp(tmp) == NULL) {
- /* XXX: Error: could not create temporary file name */
+ opkg_perror(ERROR, "Coundn't create temporary directory %s",
+ tmp);
free(lists_dir);
free(tmp);
return 1;
sprintf_alloc(&tmp_file_name, "%s/%s.gz", tmp,
src->name);
- /* XXX: Note: downloading url */
+ opkg_msg(INFO, "Downloading %s to %s...\n", url,
+ tmp_file_name);
cb_data.cb = progress_callback;
cb_data.progress_data = &pdata;
&cb_data);
if (err == 0) {
- /* XXX: Note: Inflating downloaded file */
+ opkg_msg(INFO, "Inflating %s...\n",
+ tmp_file_name);
in = fopen(tmp_file_name, "r");
out = fopen(list_file_name, "w");
if (in && out)
err = opkg_download(url, list_file_name, NULL, NULL);
if (err) {
- /* XXX: Error: download error */
- result = OPKG_DOWNLOAD_FAILED;
+ opkg_msg(ERROR, "Couldn't retrieve %s\n", url);
+ result = -1;
}
free(url);
err = opkg_download(url, sig_file_name, NULL, NULL);
if (err) {
- /* XXX: Warning: Download failed */
+ opkg_msg(ERROR, "Couldn't retrieve %s\n", url);
} else {
int err;
err = opkg_verify_file(list_file_name,
sig_file_name);
if (err == 0) {
- /* XXX: Notice: Signature check passed */
+ opkg_msg(INFO, "Signature check "
+ "passed for %s",
+ list_file_name);
} else {
- /* XXX: Warning: Signature check failed */
+ opkg_msg(ERROR, "Signature check "
+ "failed for %s",
+ list_file_name);
}
}
free(sig_file_name);
free(url);
}
#else
- /* XXX: Note: Signature check for %s skipped because GPG support was not
- * enabled in this build
- */
+ opkg_msg(INFO, "Signature check skipped for %s as GPG support"
+ " has not been enabled in this build\n",
+ list_file_name);
#endif
sources_done++;
return result;
}
+static int
+pkg_compare_names_and_version(const void *a0, const void *b0)
+{
+ const pkg_t *a = *(const pkg_t **)a0;
+ const pkg_t *b = *(const pkg_t **)b0;
+ int ret;
+
+ ret = strcmp(a->name, b->name);
+
+ if (ret == 0)
+ ret = pkg_compare_versions(a, b);
+
+ return ret;
+}
int
opkg_list_packages(opkg_package_callback_t callback, void *user_data)
all = pkg_vec_alloc();
pkg_hash_fetch_available(all);
+
+ pkg_vec_sort(all, pkg_compare_names_and_version);
+
for (i = 0; i < all->len; i++) {
pkg_t *pkg;
int repositories = 0;
int ret = 0;
int err;
- int ide
char *repo_ptr;
char *stmp;
+ char *host, *end;
src = str_list_alloc();
list_for_each_entry(iter, &conf->pkg_src_list.head, node) {
- idx = index (strstr (((pkg_src_t *) iter->data)->value, "://") + 3, '/');
- if (strstr(((pkg_src_t *) iter->data)->value, "://") && idx)
+ host = strstr(((pkg_src_t *)iter->data)->value, "://") + 3;
+ end = index(host, '/');
+ if (strstr(((pkg_src_t *) iter->data)->value, "://") && end)
stmp = xstrndup(((pkg_src_t *) iter->data)->value,
- idx -
- ((pkg_src_t *) iter->data)->value) * sizeof(char);
+ end - ((pkg_src_t *) iter->data)->value);
else
stmp = xstrdup(((pkg_src_t *) iter->data)->value);
projects / oweals / opkg-lede.git / blobdiff