moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

dload: rename cd_filename to content_disp_name 

This is more in line with the menagerie of file name members that we now
have on the payload struct.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dave Reisner 2011-08-19 11:58:45 -04:00 committed by Dan McGee
parent 329a7b7e24
commit 592ed13bce
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/libalpm/dload.c
View File

@ -168,7 +168,7 @@ static size_t parse_headers(void *ptr, size_t size, size_t nmemb, void *user)
endptr--; endptr--;
} }
STRNDUP(payload->cd_filename, fptr, endptr - fptr + 1, STRNDUP(payload->content_disp_name, fptr, endptr - fptr + 1,
RET_ERR(payload->handle, ALPM_ERR_MEMORY, realsize)); RET_ERR(payload->handle, ALPM_ERR_MEMORY, realsize));
} }
} }
@ -360,10 +360,10 @@ static int curl_download_internal(struct dload_payload *payload,
goto cleanup; goto cleanup;
} }
if(payload->cd_filename) { if(payload->content_disp_name) {
/* content-disposition header has a better name for our file */ /* content-disposition header has a better name for our file */
free(payload->destfile_name); free(payload->destfile_name);
payload->destfile_name = get_fullpath(localpath, payload->cd_filename, ""); payload->destfile_name = get_fullpath(localpath, payload->content_disp_name, "");
} else { } else {
const char *effective_filename = strrchr(effective_url, '/'); const char *effective_filename = strrchr(effective_url, '/');
if(effective_filename && strlen(effective_filename) > 2) { if(effective_filename && strlen(effective_filename) > 2) {
@ -515,7 +515,7 @@ void _alpm_dload_payload_free(struct dload_payload *payload) {
ASSERT(payload, return); ASSERT(payload, return);
FREE(payload->fileurl); FREE(payload->fileurl);
FREE(payload->cd_filename); FREE(payload->content_disp_name);
FREE(payload->tempfile_name); FREE(payload->tempfile_name);
FREE(payload->destfile_name); FREE(payload->destfile_name);
FREE(payload); FREE(payload);

2
lib/libalpm/dload.h
View File

@ -30,7 +30,7 @@ struct dload_payload {
const char *remote_name; const char *remote_name;
char *tempfile_name; char *tempfile_name;
char *destfile_name; char *destfile_name;
char *cd_filename; char *content_disp_name;
char *fileurl; char *fileurl;
double initial_size; double initial_size;
long max_size; long max_size;