#include <glib.h>
#include <glib/gstdio.h>
#include <glib/gi18n.h>
+#include <glib/gprintf.h>
#include <gtk/gtk.h>
#include <curl/curl.h>
+#include "background.h"
#include "file.h"
+#include "globals.h"
#include "curl_download.h"
+gchar *curl_download_user_agent;
+
+/*
+ * Even if writing to FILE* is supported by libcurl by default,
+ * it seems that it is non-portable (win32 DLL specific).
+ *
+ * So, we provide our own trivial CURLOPT_WRITEFUNCTION.
+ */
+static size_t curl_write_func(void *ptr, size_t size, size_t nmemb, FILE *stream)
+{
+ return fwrite(ptr, size, nmemb, stream);
+}
+
+static int curl_progress_func(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow)
+{
+ return a_background_testcancel(NULL);
+}
+
static gchar *get_cookie_file(gboolean init)
{
static gchar *cookie_file = NULL;
g_mutex_lock(mutex);
if (g_file_test(cookie_file, G_FILE_TEST_EXISTS) == FALSE) { /* file not there */
- FILE * out_file = g_fopen("/dev/null", "w");
+ gchar * name_tmp = NULL;
+ FILE * out_file = tmpfile();
+ if (out_file == NULL) {
+ // Something wrong with previous call (unsuported?)
+ name_tmp = g_strdup_printf("%s.tmp", cookie_file);
+ out_file = g_fopen(name_tmp, "w+b");
+ }
CURLcode res;
CURL *curl = curl_easy_init();
+ if (vik_verbose)
+ curl_easy_setopt ( curl, CURLOPT_VERBOSE, 1 );
curl_easy_setopt(curl, CURLOPT_URL, "http://maps.google.com/"); /* google.com sets "PREF" cookie */
- curl_easy_setopt ( curl, CURLOPT_FILE, out_file );
+ curl_easy_setopt ( curl, CURLOPT_WRITEDATA, out_file );
+ curl_easy_setopt ( curl, CURLOPT_WRITEFUNCTION, curl_write_func);
curl_easy_setopt(curl, CURLOPT_COOKIEJAR, cookie_file);
res = curl_easy_perform(curl);
if (res != CURLE_OK) {
curl_easy_cleanup(curl);
fclose(out_file);
out_file = NULL;
+ if (name_tmp != NULL) {
+ g_remove(name_tmp);
+ g_free(name_tmp);
+ name_tmp = NULL;
+ }
}
g_mutex_unlock(mutex);
{
curl_global_init(CURL_GLOBAL_ALL);
get_cookie_file(TRUE);
+ curl_download_user_agent = g_strdup_printf ("%s/%s %s", PACKAGE, VERSION, curl_version());
}
int curl_download_uri ( const char *uri, FILE *f, DownloadOptions *options )
CURLcode res = CURLE_FAILED_INIT;
const gchar *cookie_file;
+ g_debug("%s: uri=%s", __PRETTY_FUNCTION__, uri);
+
curl = curl_easy_init ();
if ( curl )
{
+ if (vik_verbose)
+ curl_easy_setopt ( curl, CURLOPT_VERBOSE, 1 );
curl_easy_setopt ( curl, CURLOPT_URL, uri );
- curl_easy_setopt ( curl, CURLOPT_FILE, f );
+ curl_easy_setopt ( curl, CURLOPT_WRITEDATA, f );
+ curl_easy_setopt ( curl, CURLOPT_WRITEFUNCTION, curl_write_func);
+ curl_easy_setopt ( curl, CURLOPT_NOPROGRESS, 0 );
+ curl_easy_setopt ( curl, CURLOPT_PROGRESSDATA, NULL );
+ curl_easy_setopt ( curl, CURLOPT_PROGRESSFUNCTION, curl_progress_func);
if (options != NULL) {
if(options->referer != NULL)
curl_easy_setopt ( curl, CURLOPT_REFERER, options->referer);
curl_easy_setopt ( curl, CURLOPT_MAXREDIRS, options->follow_location);
}
}
- curl_easy_setopt ( curl, CURLOPT_USERAGENT, PACKAGE "/" VERSION " libcurl/7.15.4" );
+ curl_easy_setopt ( curl, CURLOPT_USERAGENT, curl_download_user_agent );
if ((cookie_file = get_cookie_file(FALSE)) != NULL)
curl_easy_setopt(curl, CURLOPT_COOKIEFILE, cookie_file);
res = curl_easy_perform ( curl );