X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=blobdiff_plain;f=libopkg%2Fopkg.c;h=d994bd19888c98aa6e95fbcb1d29b94bad17d1bc;hp=dbb82fbb1c2c4b74045368d9153a1fa054c6c8d3;hb=e450488296dcb20d93dd4f48ffd887f440ce17c8;hpb=cd113c7ea9d8883d9cdc4c3e4ea4f87531737183

diff --git a/libopkg/opkg.c b/libopkg/opkg.c
index dbb82fb..d994bd1 100644
--- a/libopkg/opkg.c
+++ b/libopkg/opkg.c
@@ -15,8 +15,6 @@
    General Public License for more details.
  */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <unistd.h>
 #include <fnmatch.h>
@@ -43,8 +41,7 @@
 
 /** Private Functions ***/
 
-static int
-opkg_configure_packages(char *pkg_name)
+static int opkg_configure_packages(char *pkg_name)
 {
 	pkg_vec_t *all;
 	int i;
@@ -77,46 +74,10 @@ opkg_configure_packages(char *pkg_name)
 	return err;
 }
 
-struct _curl_cb_data {
-	opkg_progress_callback_t cb;
-	opkg_progress_data_t *progress_data;
-	void *user_data;
-	int start_range;
-	int finish_range;
-};
-
-int
-curl_progress_cb(struct _curl_cb_data *cb_data, double t,	/* dltotal */
-		double d,	/* dlnow */
-		double ultotal, double ulnow)
-{
-	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)
-		return 0;
-	prev = p;
-
-	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->progress_data, cb_data->user_data);
-
-	return 0;
-}
-
-
 static struct opkg_conf saved_conf;
 /*** Public API ***/
 
-int
-opkg_new()
+int opkg_new()
 {
 	saved_conf = *conf;
 
@@ -126,7 +87,7 @@ opkg_new()
 	if (opkg_conf_load())
 		goto err0;
 
-	if (pkg_hash_load_feeds())
+	if (pkg_hash_load_feeds(0))
 		goto err1;
 
 	if (pkg_hash_load_status_files())
@@ -141,25 +102,19 @@ err0:
 	return -1;
 }
 
-void
-opkg_free(void)
+void opkg_free(void)
 {
-#ifdef HAVE_CURL
-	opkg_curl_cleanup();
-#endif
 	opkg_conf_deinit();
 }
 
-int
-opkg_re_read_config_files(void)
+int opkg_re_read_config_files(void)
 {
 	opkg_free();
 	*conf = saved_conf;
 	return opkg_new();
 }
 
-void
-opkg_get_option(char *option, void **value)
+void opkg_get_option(char *option, void **value)
 {
 	int i = 0;
 	extern opkg_option_t options[];
@@ -177,22 +132,21 @@ opkg_get_option(char *option, void **value)
 	/* get the option */
 	switch (options[i].type) {
 	case OPKG_OPT_TYPE_BOOL:
-		*((int *) value) = *((int *) options[i].value);
+		*((int *)value) = *((int *)options[i].value);
 		return;
 
 	case OPKG_OPT_TYPE_INT:
-		*((int *) value) = *((int *) options[i].value);
+		*((int *)value) = *((int *)options[i].value);
 		return;
 
 	case OPKG_OPT_TYPE_STRING:
-		*((char **) value) = xstrdup(options[i].value);
+		*((char **)value) = xstrdup(options[i].value);
 		return;
 	}
 
 }
 
-void
-opkg_set_option(char *option, void *value)
+void opkg_set_option(char *option, void *value)
 {
 	int i = 0, found = 0;
 	extern opkg_option_t options[];
@@ -219,18 +173,18 @@ opkg_set_option(char *option, void *value)
 	/* set the option */
 	switch (options[i].type) {
 	case OPKG_OPT_TYPE_BOOL:
-		if (*((int *) value) == 0)
-			*((int *) options[i].value) = 0;
+		if (*((int *)value) == 0)
+			*((int *)options[i].value) = 0;
 		else
-			*((int *) options[i].value) = 1;
+			*((int *)options[i].value) = 1;
 		return;
 
 	case OPKG_OPT_TYPE_INT:
-		*((int *) options[i].value) = *((int *) value);
+		*((int *)options[i].value) = *((int *)value);
 		return;
 
 	case OPKG_OPT_TYPE_STRING:
-		*((char **) options[i].value) = xstrdup(value);
+		*((char **)options[i].value) = xstrdup(value);
 		return;
 	}
 
@@ -243,28 +197,28 @@ opkg_set_option(char *option, void *value)
  */
 int
 opkg_install_package(const char *package_name,
-		opkg_progress_callback_t progress_callback,
-		void *user_data)
+		     opkg_progress_callback_t progress_callback,
+		     void *user_data)
 {
 	int err;
-	char *stripped_filename;
+	char *stripped_filename, *local_filename;
 	opkg_progress_data_t pdata;
 	pkg_t *old, *new;
 	pkg_vec_t *deps, *all;
-	int i, ndepends;
+	int i;
 	char **unresolved = NULL;
+	const char *filename;
 
 	opkg_assert(package_name != NULL);
 
 	/* ... */
 	pkg_info_preinstall_check();
 
-
 	/* check to ensure package is not already installed */
 	old = pkg_hash_fetch_installed_by_name(package_name);
 	if (old) {
 		opkg_msg(ERROR, "Package %s is already installed\n",
-				package_name);
+			 package_name);
 		return -1;
 	}
 
@@ -284,12 +238,11 @@ opkg_install_package(const char *package_name,
 	/* 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);
+	pkg_hash_fetch_unsatisfied_dependencies(new, deps, &unresolved);
 	if (unresolved) {
 		char **tmp = unresolved;
 		opkg_msg(ERROR, "Couldn't satisfy the following dependencies"
-			       " for %s:\n", package_name);
+			 " for %s:\n", package_name);
 		while (*tmp) {
 			opkg_msg(ERROR, "\t%s", *tmp);
 			free(*tmp);
@@ -307,11 +260,10 @@ opkg_install_package(const char *package_name,
 	/* download package and dependencies */
 	for (i = 0; i < deps->len; i++) {
 		pkg_t *pkg;
-		struct _curl_cb_data cb_data;
 		char *url;
 
 		pkg = deps->pkgs[i];
-		if (pkg->local_filename)
+		if (pkg_get_string(pkg, PKG_LOCAL_FILENAME))
 			continue;
 
 		pdata.pkg = pkg;
@@ -319,30 +271,25 @@ opkg_install_package(const char *package_name,
 
 		if (pkg->src == NULL) {
 			opkg_msg(ERROR, "Package %s not available from any "
-					"configured src\n", package_name);
+				 "configured src\n", package_name);
 			return -1;
 		}
 
-		sprintf_alloc(&url, "%s/%s", pkg->src->value, pkg->filename);
+		filename = pkg_get_string(pkg, PKG_FILENAME);
+
+		sprintf_alloc(&url, "%s/%s", pkg->src->value, filename);
 
 		/* Get the filename part, without any directory */
-		stripped_filename = strrchr(pkg->filename, '/');
+		stripped_filename = strrchr(filename, '/');
 		if (!stripped_filename)
-			stripped_filename = pkg->filename;
+			stripped_filename = (char *)filename;
 
-		sprintf_alloc(&pkg->local_filename, "%s/%s", conf->tmp_dir,
+		sprintf_alloc(&local_filename, "%s/%s", conf->tmp_dir,
 			      stripped_filename);
 
-		cb_data.cb = progress_callback;
-		cb_data.progress_data = &pdata;
-		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;
+		pkg_set_string(pkg, PKG_LOCAL_FILENAME, local_filename);
 
-		err = opkg_download(url, pkg->local_filename,
-				    (curl_progress_func) curl_progress_cb,
-				    &cb_data, 0);
+		err = opkg_download(url, local_filename, 0);
 		free(url);
 
 		if (err) {
@@ -361,7 +308,6 @@ opkg_install_package(const char *package_name,
 	}
 	pkg_vec_free(all);
 
-
 	/* 75% of "install" progress is for downloading */
 	pdata.pkg = new;
 	pdata.action = OPKG_INSTALL;
@@ -392,7 +338,7 @@ opkg_install_package(const char *package_name,
 
 int
 opkg_remove_package(const char *package_name,
-		opkg_progress_callback_t progress_callback, void *user_data)
+		    opkg_progress_callback_t progress_callback, void *user_data)
 {
 	int err;
 	pkg_t *pkg = NULL;
@@ -416,12 +362,12 @@ opkg_remove_package(const char *package_name,
 
 	if (conf->restrict_to_default_dest) {
 		pkg_to_remove = pkg_hash_fetch_installed_by_name_dest(pkg->name,
-						      conf->default_dest);
+								      conf->
+								      default_dest);
 	} else {
 		pkg_to_remove = pkg_hash_fetch_installed_by_name(pkg->name);
 	}
 
-
 	progress(pdata, 75);
 
 	err = opkg_remove_pkg(pkg_to_remove, 0);
@@ -430,15 +376,14 @@ opkg_remove_package(const char *package_name,
 	opkg_conf_write_status_files();
 	pkg_write_changed_filelists();
 
-
 	progress(pdata, 100);
 	return (err) ? -1 : 0;
 }
 
 int
 opkg_upgrade_package(const char *package_name,
-		opkg_progress_callback_t progress_callback,
-		void *user_data)
+		     opkg_progress_callback_t progress_callback,
+		     void *user_data)
 {
 	int err;
 	pkg_t *pkg;
@@ -529,7 +474,7 @@ opkg_upgrade_all(opkg_progress_callback_t progress_callback, void *user_data)
 
 int
 opkg_update_package_lists(opkg_progress_callback_t progress_callback,
-			void *user_data)
+			  void *user_data)
 {
 	char *tmp;
 	int err, result = 0;
@@ -544,7 +489,7 @@ opkg_update_package_lists(opkg_progress_callback_t progress_callback,
 	progress(pdata, 0);
 
 	sprintf_alloc(&lists_dir, "%s", (conf->restrict_to_default_dest)
-		? conf->default_dest->lists_dir : conf->lists_dir);
+		      ? conf->default_dest->lists_dir : conf->lists_dir);
 
 	if (!file_is_dir(lists_dir)) {
 		if (file_exists(lists_dir)) {
@@ -556,7 +501,7 @@ opkg_update_package_lists(opkg_progress_callback_t progress_callback,
 		err = file_mkdir_hier(lists_dir, 0755);
 		if (err) {
 			opkg_msg(ERROR, "Couldn't create lists_dir %s\n",
-					lists_dir);
+				 lists_dir);
 			free(lists_dir);
 			return 1;
 		}
@@ -565,7 +510,7 @@ opkg_update_package_lists(opkg_progress_callback_t progress_callback,
 	sprintf_alloc(&tmp, "%s/update-XXXXXX", conf->tmp_dir);
 	if (mkdtemp(tmp) == NULL) {
 		opkg_perror(ERROR, "Coundn't create temporary directory %s",
-				tmp);
+			    tmp);
 		free(lists_dir);
 		free(tmp);
 		return 1;
@@ -593,13 +538,13 @@ opkg_update_package_lists(opkg_progress_callback_t progress_callback,
 
 		sprintf_alloc(&list_file_name, "%s/%s", lists_dir, src->name);
 
-		if (opkg_download(url, list_file_name, NULL, NULL, 0)) {
+		if (opkg_download(url, list_file_name, 0)) {
 			opkg_msg(ERROR, "Couldn't retrieve %s\n", url);
 			result = -1;
 		}
 		free(url);
 
-#if defined(HAVE_GPGME) || defined(HAVE_OPENSSL)
+#if defined(HAVE_USIGN)
 		if (conf->check_signature) {
 			char *sig_file_name;
 			/* download detached signitures to verify the package lists */
@@ -618,21 +563,21 @@ opkg_update_package_lists(opkg_progress_callback_t progress_callback,
 			/* make sure there is no existing signature file */
 			unlink(sig_file_name);
 
-			err = opkg_download(url, sig_file_name, NULL, NULL, 0);
+			err = opkg_download(url, sig_file_name, 0);
 			if (err) {
 				opkg_msg(ERROR, "Couldn't retrieve %s\n", url);
 			} else {
 				int err;
 				err = opkg_verify_file(list_file_name,
-						     sig_file_name);
+						       sig_file_name);
 				if (err == 0) {
 					opkg_msg(INFO, "Signature check "
-							"passed for %s",
-							list_file_name);
+						 "passed for %s",
+						 list_file_name);
 				} else {
 					opkg_msg(ERROR, "Signature check "
-							"failed for %s",
-							list_file_name);
+						 "failed for %s",
+						 list_file_name);
 				}
 			}
 			free(sig_file_name);
@@ -640,8 +585,8 @@ opkg_update_package_lists(opkg_progress_callback_t progress_callback,
 		}
 #else
 		opkg_msg(INFO, "Signature check skipped for %s as GPG support"
-				" has not been enabled in this build\n",
-				list_file_name);
+			 " has not been enabled in this build\n",
+			 list_file_name);
 #endif
 		free(list_file_name);
 
@@ -659,8 +604,7 @@ opkg_update_package_lists(opkg_progress_callback_t progress_callback,
 	return result;
 }
 
-static int
-pkg_compare_names_and_version(const void *a0, const void *b0)
+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;
@@ -674,8 +618,7 @@ pkg_compare_names_and_version(const void *a0, const void *b0)
 	return ret;
 }
 
-int
-opkg_list_packages(opkg_package_callback_t callback, void *user_data)
+int opkg_list_packages(opkg_package_callback_t callback, void *user_data)
 {
 	pkg_vec_t *all;
 	int i;
@@ -715,8 +658,10 @@ opkg_list_upgradable_packages(opkg_package_callback_t callback, void *user_data)
 	head = prepare_upgrade_list();
 	for (node = active_list_next(head, head); node;
 	     node = active_list_next(head, node)) {
-		old = list_entry(node, pkg_t, list);
-		new = pkg_hash_fetch_best_installation_candidate_by_name(old->name);
+		old = node->pkg;
+		new =
+		    pkg_hash_fetch_best_installation_candidate_by_name(old->
+								       name);
 		if (new == NULL)
 			continue;
 		callback(new, user_data);
@@ -725,9 +670,8 @@ opkg_list_upgradable_packages(opkg_package_callback_t callback, void *user_data)
 	return 0;
 }
 
-pkg_t *
-opkg_find_package(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)
 {
 	int pkg_found = 0;
 	pkg_t *pkg = NULL;
@@ -756,7 +700,7 @@ opkg_find_package(const char *name, const char *ver, const char *arch,
 
 		/* check architecture */
 		if (arch) {
-			if (sstrcmp(pkg->architecture, arch))
+			if (sstrcmp(pkg_get_architecture(pkg), arch))
 				continue;
 		}
 
@@ -780,8 +724,7 @@ opkg_find_package(const char *name, const char *ver, const char *arch,
  * @brief Check the accessibility of repositories.
  * @return return how many repositories cannot access. 0 means all okay.
  */
-int
-opkg_repository_accessibility_check(void)
+int opkg_repository_accessibility_check(void)
 {
 	pkg_src_list_elt_t *iter;
 	str_list_elt_t *iter1;
@@ -795,11 +738,12 @@ opkg_repository_accessibility_check(void)
 	src = str_list_alloc();
 
 	list_for_each_entry(iter, &conf->pkg_src_list.head, node) {
-		host = strstr(((pkg_src_t *)iter->data)->value, "://") + 3;
+		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,
-				     end - ((pkg_src_t *) iter->data)->value);
+					end -
+					((pkg_src_t *) iter->data)->value);
 		else
 			stmp = xstrdup(((pkg_src_t *) iter->data)->value);
 
@@ -823,7 +767,7 @@ opkg_repository_accessibility_check(void)
 		iter1 = str_list_pop(src);
 		repositories--;
 
-		if (opkg_download(iter1->data, "/dev/null", NULL, NULL, 0))
+		if (opkg_download(iter1->data, "/dev/null", 0))
 			ret++;
 		str_list_elt_deinit(iter1);
 	}