devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-19 09:56:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rework url to filename

Browse Source
This commit is contained in:
William Wennerström
2020-12-06 17:02:09 +01:00
parent 1d2c0a8836
commit ac03037847
5 changed files with 105 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/tools/aesgcm_download.c
View File

@@ -85,11 +85,6 @@ aesgcm_file_get(void* userdata)
"(%s).",
https_url, g_strerror(errno));
return NULL;
} else {
// TODO(wstrm): Maybe refactor this to use file handles so we do not
// have to open a dummy file descriptor and then close it.
// It's pretty ugly this way...
close(tmpfd);
}
FILE* outfh = fopen(aesgcm_dl->filename, "wb");
@@ -107,6 +102,7 @@ aesgcm_file_get(void* userdata)
http_dl->worker = aesgcm_dl->worker;
http_dl->url = strdup(https_url);
http_dl->filename = strdup(tmpname);
http_dl->cmd_template = NULL;
aesgcm_dl->http_dl = http_dl;
@@ -117,7 +113,7 @@ aesgcm_file_get(void* userdata)
http_print_transfer_update(aesgcm_dl->window, aesgcm_dl->url,
"Downloading '%s' failed: Unable to open "
"temporary file at '%s' for reading (%s).",
aesgcm_dl->url, aesgcm_dl->filename,
aesgcm_dl->url, tmpname,
g_strerror(errno));
return NULL;
}
@@ -130,6 +126,7 @@ aesgcm_file_get(void* userdata)
cons_show_error(g_strerror(errno));
}
close(tmpfd);
remove(tmpname);
g_free(tmpname);
@@ -149,7 +146,7 @@ aesgcm_file_get(void* userdata)
if (aesgcm_dl->cmd_template != NULL) {
gchar** argv = format_call_external_argv(aesgcm_dl->cmd_template,
aesgcm_dl->url,
aesgcm_dl->filename,
aesgcm_dl->filename);
// TODO(wstrm): Log the error.
@@ -164,11 +161,11 @@ aesgcm_file_get(void* userdata)
}
g_strfreev(argv);
free(aesgcm_dl->cmd_template);
}
free(aesgcm_dl->filename);
free(aesgcm_dl->url);
free(aesgcm_dl->cmd_template);
free(aesgcm_dl);
return NULL;

1
src/tools/http_download.c
View File

@@ -205,6 +205,7 @@ http_file_get(void* userdata)
}
g_strfreev(argv);
free(download->cmd_template);
}
free(download->url);