opkg_option_t *options;
};
+#define opkg_assert(expr) if (!(expr)) { \
+ 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);
+
/** Private Functions ***/
return err;
}
+struct _curl_cb_data
+{
+ opkg_progress_callback_t cb;
+ opkg_t *opkg;
+ 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;
+
+ /* prevent the same value being sent twice (can occur due to rounding) */
+ if (p == prev)
+ return 0;
+ prev = p;
+
+ if (t < 1)
+ return 0;
+
+ (cb_data->cb) (cb_data->opkg,
+ cb_data->start_range + (d/t * ((cb_data->finish_range - cb_data->start_range))),
+ cb_data->user_data);
+
+ return 0;
+}
/*** Public API ***/
void
opkg_free (opkg_t *opkg)
{
+ opkg_assert (opkg != NULL);
+
opkg_conf_deinit (opkg->conf);
args_deinit (opkg->args);
}
int
opkg_read_config_files (opkg_t *opkg)
{
- args_t *a = opkg->args;
- opkg_conf_t *c = opkg->conf;
+ 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 */
opkg_get_option (opkg_t *opkg, char *option, void **value)
{
int i = 0;
- opkg_option_t *options = opkg->options;
+ opkg_option_t *options;
- /* can't store a value in a NULL pointer! */
- if (!value)
- return;
+ 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
opkg_set_option (opkg_t *opkg, char *option, void *value)
{
int i = 0;
- opkg_option_t *options = opkg->options;
+ opkg_option_t *options;
- /* NULL values are not defined */
- if (!value)
- return;
+ 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
int err;
char *package_id = NULL;
- progress_callback (opkg, 0, user_data);
+ opkg_assert (opkg != NULL);
+ opkg_assert (package_name != NULL);
+
+ progress (0);
/* download the package */
opkg_prepare_url_for_install (opkg->conf, package_name, &package_id);
- progress_callback (opkg, 50, user_data);
+
+ progress (50);
/* ... */
pkg_info_preinstall_check (opkg->conf);
if (err)
return err;
- progress_callback (opkg, 75, user_data);
+ progress (75);
/* run configure scripts, etc. */
err = opkg_configure_packages (opkg->conf, NULL);
opkg_conf_write_status_files (opkg->conf);
pkg_write_changed_filelists (opkg->conf);
- progress_callback (opkg, 100, user_data);
+ progress (100);
return 0;
}
pkg_t *pkg = NULL;
pkg_t *pkg_to_remove;
- if (!opkg)
- return 1;
-
- if (!package_name)
- return 1;
+ opkg_assert (opkg != NULL);
+ opkg_assert (package_name != NULL);
- progress_callback (opkg, 0, user_data);
+ progress (0);
pkg_info_preinstall_check (opkg->conf);
pkg_hash_fetch_all_installed (&opkg->conf->pkg_hash, installed_pkgs);
- progress_callback (opkg, 25, user_data);
+ progress (25);
pkg = pkg_hash_fetch_installed_by_name (&opkg->conf->pkg_hash, package_name);
return 1;
}
- progress_callback (opkg, 75, user_data);
+ progress (75);
if (opkg->conf->restrict_to_default_dest)
{
}
- progress_callback (opkg, 75, user_data);
+ progress (75);
opkg_remove_pkg (opkg->conf, pkg_to_remove, 0);
pkg_write_changed_filelists (opkg->conf);
- progress_callback (opkg, 100, user_data);
+ progress (100);
return 0;
}
int
opkg_upgrade_package (opkg_t *opkg, const char *package_name, opkg_progress_callback_t progress_callback, void *user_data)
{
- return 1;
+ pkg_t *pkg;
+
+ opkg_assert (opkg != NULL);
+ opkg_assert (package_name != NULL);
+
+ progress (0);
+
+ pkg_info_preinstall_check (opkg->conf);
+
+ if (opkg->conf->restrict_to_default_dest)
+ {
+ pkg = pkg_hash_fetch_installed_by_name_dest (&opkg->conf->pkg_hash,
+ package_name,
+ opkg->conf->default_dest);
+ if (pkg == NULL)
+ {
+ /* XXX: Error: Package not installed in default_dest */
+ return 1;
+ }
+ }
+ else
+ {
+ pkg = pkg_hash_fetch_installed_by_name (&opkg->conf->pkg_hash,
+ package_name);
+ }
+
+ if (!pkg)
+ {
+ /* XXX: Error: Package not installed */
+ return 1;
+ }
+
+ progress (25);
+
+ opkg_upgrade_pkg (opkg->conf, pkg);
+ progress (75);
+
+ opkg_configure_packages (opkg->conf, NULL);
+ progress (100);
+ return 0;
}
int
opkg_upgrade_all (opkg_t *opkg, opkg_progress_callback_t progress_callback, void *user_data)
{
- return 1;
+ pkg_vec_t *installed;
+ int err = 0;
+ int i;
+ pkg_t *pkg;
+
+ opkg_assert (opkg != NULL);
+ progress (0);
+
+ installed = pkg_vec_alloc ();
+ pkg_info_preinstall_check (opkg->conf);
+
+ pkg_hash_fetch_all_installed (&opkg->conf->pkg_hash, installed);
+ for (i = 0; i < installed->len; i++)
+ {
+ pkg = installed->pkgs[i];
+ err += opkg_upgrade_pkg (opkg->conf, pkg);
+ progress (100 * i / installed->len);
+ }
+ pkg_vec_free (installed);
+
+ if (err)
+ return 1;
+
+ err = opkg_configure_packages (opkg->conf, NULL);
+ if (err)
+ return 1;
+
+ progress (100);
+ return 0;
}
int
pkg_src_t *src;
int sources_list_count, sources_done;
- progress_callback (opkg, 0, user_data);
+ opkg_assert (opkg != NULL);
+
+ progress (0);
sprintf_alloc (&lists_dir, "%s",
(opkg->conf->restrict_to_default_dest)
{
char *tmp_file_name;
FILE *in, *out;
+ struct _curl_cb_data cb_data;
sprintf_alloc (&tmp_file_name, "%s/%s.gz", tmp, src->name);
/* XXX: Note: downloading url */
- err = opkg_download (opkg->conf, url, tmp_file_name);
+
+ cb_data.cb = progress_callback;
+ 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);
if (err == 0)
{
}
}
else
- err = opkg_download (opkg->conf, url, list_file_name);
+ err = opkg_download (opkg->conf, url, list_file_name, NULL, NULL);
if (err)
{
sprintf_alloc (&tmp_file_name, "%s/%s", tmp, "Packages.sig");
- err = opkg_download (opkg->conf, url, tmp_file_name);
+ err = opkg_download (opkg->conf, url, tmp_file_name, NULL, NULL);
if (err)
{
/* XXX: Warning: Download failed */
free (list_file_name);
sources_done++;
- progress_callback (opkg, 100 * sources_done / sources_list_count, user_data);
+ progress (100 * sources_done / sources_list_count);
}
+
rmdir (tmp);
free (tmp);
free (lists_dir);
projects / oweals / opkg-lede.git / blobdiff