DeforaOS/Surfer
DeforaOS/Surfer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed downloading with WebKit when output filename is not absolute

Browse Source
This commit is contained in:
Pierre Pronchery 2010-12-05 01:15:01 +00:00
parent 0ed11dbddb
commit 44db3a6b8a
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/download.c
View File

@ -564,23 +564,32 @@ static gboolean _download_on_idle(gpointer data)
DownloadPrefs * prefs = &download->prefs; DownloadPrefs * prefs = &download->prefs;
char * p = NULL; char * p = NULL;
#ifdef WITH_WEBKIT #ifdef WITH_WEBKIT
char * cwd = NULL;
size_t len; size_t len;
WebKitNetworkRequest * request; WebKitNetworkRequest * request;
download->timeout = 0; download->timeout = 0;
len = strlen(prefs->output) + 6; if(prefs->output[0] != '/' && (cwd = getcwd(NULL, 0)) == NULL)
if((p = malloc(len)) == NULL)
{ {
_download_error(download, prefs->output, 0); _download_error(download, prefs->output, 0);
download_cancel(download); download_cancel(download);
return FALSE; return FALSE;
} }
/* FIXME needs to be an absolute path */ len = ((cwd != NULL) ? strlen(cwd) : 0) + strlen(prefs->output) + 7;
snprintf(p, len, "%s%s", "file:", prefs->output); if((p = malloc(len)) == NULL)
{
_download_error(download, prefs->output, 0);
download_cancel(download);
free(cwd);
return FALSE;
}
snprintf(p, len, "%s%s%s%s", "file:", (cwd != NULL) ? cwd : "",
(cwd != NULL) ? "/" : "", prefs->output);
request = webkit_network_request_new(download->url); request = webkit_network_request_new(download->url);
download->conn = webkit_download_new(request); download->conn = webkit_download_new(request);
webkit_download_set_destination_uri(download->conn, p); webkit_download_set_destination_uri(download->conn, p);
free(p); free(p);
free(cwd);
webkit_download_start(download->conn); webkit_download_start(download->conn);
#else #else
download->timeout = 0; download->timeout = 0;
@ -637,8 +646,8 @@ static gboolean _download_on_timeout(gpointer data)
d->conn); d->conn);
break; break;
case WEBKIT_DOWNLOAD_STATUS_STARTED: case WEBKIT_DOWNLOAD_STATUS_STARTED:
gtk_label_set_text(GTK_LABEL(d->status), _( gtk_label_set_text(GTK_LABEL(d->status),
"Downloading")); _("Downloading"));
d->data_received = webkit_download_get_current_size( d->data_received = webkit_download_get_current_size(
d->conn); d->conn);
d->content_length = webkit_download_get_total_size( d->content_length = webkit_download_get_total_size(