ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removes tabs, added full path of downloaded file.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8467 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2011-04-27 00:13:29 +00:00
parent af2476c6e0
commit 577d837588
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/addons/network_http.cpp
View File

@ -87,7 +87,7 @@ NetworkHttp::NetworkHttp() : m_news(std::vector<NewsMessage>()),
{ {
delete m_thread_id; delete m_thread_id;
m_thread_id = 0; m_thread_id = 0;
printf("[addons] Warning: could not create thread, error=%d.\n", errno); printf("[addons] Warning: could not create thread, error=%d.\n", errno);
} }
pthread_attr_destroy(&attr); pthread_attr_destroy(&attr);
} // NetworkHttp } // NetworkHttp
@ -639,7 +639,7 @@ std::string NetworkHttp::downloadToStrInternal(std::string url)
curl_easy_setopt(session, CURLOPT_URL, full_url.c_str()); curl_easy_setopt(session, CURLOPT_URL, full_url.c_str());
std::string uagent = (std::string)"SuperTuxKart/" + STK_VERSION; std::string uagent = (std::string)"SuperTuxKart/" + STK_VERSION;
curl_easy_setopt(session, CURLOPT_USERAGENT, uagent.c_str()); curl_easy_setopt(session, CURLOPT_USERAGENT, uagent.c_str());
curl_easy_setopt(session, CURLOPT_FOLLOWLOCATION, 1); curl_easy_setopt(session, CURLOPT_FOLLOWLOCATION, 1);
std::string fout; std::string fout;
@ -666,7 +666,8 @@ bool NetworkHttp::downloadFileInternal(const std::string &url,
bool is_asynchron) bool is_asynchron)
{ {
if(UserConfigParams::m_verbosity>=3) if(UserConfigParams::m_verbosity>=3)
printf("[addons] Downloading %s\n", url.c_str()); printf("[addons] Downloading '%s' as '%s').\n", url.c_str(),
file_manager->getAddonsFile(save_filename).c_str());
CURL *session = curl_easy_init(); CURL *session = curl_easy_init();
std::string full_url = url; std::string full_url = url;
if(url.substr(0, 5)!="http:" && url.substr(0, 4)!="ftp:") if(url.substr(0, 5)!="http:" && url.substr(0, 4)!="ftp:")
@ -676,7 +677,8 @@ bool NetworkHttp::downloadFileInternal(const std::string &url,
curl_easy_setopt(session, CURLOPT_URL, full_url.c_str()); curl_easy_setopt(session, CURLOPT_URL, full_url.c_str());
std::string uagent = (std::string)"SuperTuxKart/" + STK_VERSION; std::string uagent = (std::string)"SuperTuxKart/" + STK_VERSION;
curl_easy_setopt(session, CURLOPT_USERAGENT, uagent.c_str()); curl_easy_setopt(session, CURLOPT_USERAGENT, uagent.c_str());
curl_easy_setopt(session, CURLOPT_FOLLOWLOCATION, 1); curl_easy_setopt(session, CURLOPT_FOLLOWLOCATION, 1);
FILE * fout = fopen(file_manager->getAddonsFile(save_filename).c_str(), FILE * fout = fopen(file_manager->getAddonsFile(save_filename).c_str(),
"wb"); "wb");