summaryrefslogtreecommitdiffstats
path: root/opkg_download.c
diff options
context:
space:
mode:
Diffstat (limited to 'opkg_download.c')
-rw-r--r--opkg_download.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/opkg_download.c b/opkg_download.c
index c0a66fe..3370b1f 100644
--- a/opkg_download.c
+++ b/opkg_download.c
@@ -34,11 +34,11 @@ opkg_download_progress_callback opkg_cb_download_progress = NULL;
#endif
int
-curl_progress_func (void* data,
- double t, /* dltotal */
- double d, /* dlnow */
- double ultotal,
- double ulnow)
+curl_progress_func (char* url,
+ double t, /* dltotal */
+ double d, /* dlnow */
+ double ultotal,
+ double ulnow)
{
int i;
int p = d*100/t;
@@ -46,7 +46,7 @@ curl_progress_func (void* data,
#ifdef OPKG_LIB
if (opkg_cb_download_progress)
{
- opkg_cb_download_progress (p);
+ opkg_cb_download_progress (p, url);
return 0;
}
#endif
@@ -142,7 +142,8 @@ int opkg_download(opkg_conf_t *conf, const char *src, const char *dest_file_name
{
curl_easy_setopt (curl, CURLOPT_URL, src);
curl_easy_setopt (curl, CURLOPT_WRITEDATA, file);
- curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0);
+ curl_easy_setopt (curl, CURLOPT_NOPROGRESS, 0);
+ curl_easy_setopt (curl, CURLOPT_PROGRESSDATA, src);
curl_easy_setopt (curl, CURLOPT_PROGRESSFUNCTION, curl_progress_func);
if (conf->http_proxy || conf->ftp_proxy)
{