Skip to content

different header handling #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Pan7 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

different header handling #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
12ca77c
different header handling
Pan7 Jun 15, 2014
b73b1ea
removing default pk3 filename
Pan7 Jun 16, 2014
da349e1
Merge pull request #1 from Pan7/pan2
Pan7 Jun 17, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 36 additions & 26 deletions code/client/cl_download.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@ static size_t Curl_WriteCallback_f(void *ptr, size_t size, size_t nmemb, void *s
Q_strncpyz(dl_error, "No pk3 returned - requested map is probably unknown.", sizeof(dl_error));
return 0;
}
if (strlen(path) == 0) {
Com_sprintf(dl_error, sizeof(dl_error), "The server did not return a pk3 filename.");
return 0;
}
// make sure the path doesn't have directory information.
for (c=path; *c; c++) {
if (*c == '\\' || *c == '/' || *c == ':') {
Expand Down Expand Up @@ -131,20 +135,20 @@ static size_t Curl_HeaderCallback_f(void *ptr, size_t size, size_t nmemb, void *
char buf[1024];
char *c;

if (size*nmemb == 0) {
return 0;
}

// make a copy and remove the trailing crlf chars.
if (size*nmemb >= sizeof(buf)) {
Q_strncpyz(dl_error, "Curl_HeaderCallback_f() overflow.", sizeof(dl_error));
return (size_t)-1;
return 0;
}
Q_strncpyz(buf, ptr, size*nmemb+1);
buf[size*nmemb] = '\0';
c = buf +strlen(buf)-1;
while (c>buf && (*c == '\r' || *c == '\n')) {
*(c--) = 0;
}

// make sure it's not empty.
if (c <= buf) {
return size*nmemb;
*(c--) = '\0';
}

// verbose output
Expand All @@ -165,10 +169,11 @@ static size_t Curl_HeaderCallback_f(void *ptr, size_t size, size_t nmemb, void *
* The actual filename will be validated later, when the transfer is started.
*/
if (!strncasecmp(buf, "content-disposition:", 20)) {
const char *c = strstr(buf, "filename=") +9;
if (c != (char*)9) {
const char *c = strstr(buf, "filename=");
if (c != NULL) {
const char *e;
char token=0;
c += 9; //filename=
if (*c == '"' || *c == '\'') {
token = *c++;
}
Expand Down Expand Up @@ -406,7 +411,9 @@ int DL_Begin( const char *map, qboolean nonblocking )
Com_sprintf(url, sizeof(url), "%s%s%s", url, curl_easy_escape(curl, map, 0), c+2);

// set a default destination filename; Content-Disposition headers will override.
Com_sprintf(path, sizeof(path), "%s.pk3", map);
//Com_sprintf(path, sizeof(path), "%s.pk3", map);
//there is no default filename
path[0] = '\0';

curl = curl_easy_init();
if (!curl) {
Expand Down Expand Up @@ -512,26 +519,29 @@ void DL_End( CURLcode res, CURLMcode resm )
if (f) {
FS_FCloseFile(f);
f = 0;
if (!*dl_error) { // download succeeded
char dest[MAX_OSPATH];
Com_Printf("Download complete, restarting filesystem.\n");
Q_strncpyz(dest, path, strlen(path)-3); // -4 +1 for the trailing \0
Q_strcat(dest, sizeof(dest), ".pk3");
if (!FS_SV_FileExists(dest)) {
FS_SV_Rename(path, dest);
FS_Restart(clc.checksumFeed);
if (dl_showmotd->integer && *motd) {
Com_Printf("Server motd: %s\n", motd);
if (strlen(path) > 4)
{
if (!*dl_error) { // download succeeded
char dest[MAX_OSPATH];
Com_Printf("Download complete, restarting filesystem.\n");
Q_strncpyz(dest, path, strlen(path)-3); // -4 +1 for the trailing \0
Q_strcat(dest, sizeof(dest), ".pk3");
if (!FS_SV_FileExists(dest)) {
FS_SV_Rename(path, dest);
FS_Restart(clc.checksumFeed);
if (dl_showmotd->integer && *motd) {
Com_Printf("Server motd: %s\n", motd);
}
} else {
// normally such errors should be caught upon starting the transfer. Anyway better do
// it here again - the filesystem might have changed, plus this may help contain some
// bugs / exploitable flaws in the code.
Com_Printf("Failed to copy downloaded file to its location - file already exists.\n");
FS_SV_RemoveFile(path);
}
} else {
// normally such errors should be caught upon starting the transfer. Anyway better do
// it here again - the filesystem might have changed, plus this may help contain some
// bugs / exploitable flaws in the code.
Com_Printf("Failed to copy downloaded file to its location - file already exists.\n");
FS_SV_RemoveFile(path);
}
} else {
FS_SV_RemoveFile(path);
}
}

Expand Down