added indirection cube map for shadowmapping and revised filtering modes

[xonotic/darkplaces.git] / libcurl.c

diff --git a/libcurl.c b/libcurl.c
index 58c017857fe9fa9d2dd7eba9c7b6f29ff51bc693..085dd415d78d841856c3d258188be4d5fa142ff7 100644 (file)
--- a/libcurl.c
+++ b/libcurl.c
@@ -128,15 +128,15 @@ typedef struct
 CURLMsg;
 
 static void (*qcurl_global_init) (long flags);
-static void (*qcurl_global_cleanup) ();
+static void (*qcurl_global_cleanup) (void);
 
-static CURL * (*qcurl_easy_init) ();
+static CURL * (*qcurl_easy_init) (void);
 static void (*qcurl_easy_cleanup) (CURL *handle);
 static CURLcode (*qcurl_easy_setopt) (CURL *handle, CURLoption option, ...);
 static CURLcode (*qcurl_easy_getinfo) (CURL *handle, CURLINFO info, ...);
 static const char * (*qcurl_easy_strerror) (CURLcode);
 
-static CURLM * (*qcurl_multi_init) ();
+static CURLM * (*qcurl_multi_init) (void);
 static CURLMcode (*qcurl_multi_perform) (CURLM *multi_handle, int *running_handles);
 static CURLMcode (*qcurl_multi_add_handle) (CURLM *multi_handle, CURL *easy_handle);
 static CURLMcode (*qcurl_multi_remove_handle) (CURLM *multi_handle, CURL *easy_handle);
@@ -169,7 +169,7 @@ static dllhandle_t curl_dll = NULL;
 
 typedef struct downloadinfo_s
 {
-       char filename[MAX_QPATH];
+       char filename[MAX_OSPATH];
        char url[1024];
        char referer[256];
        qfile_t *stream;
@@ -240,7 +240,7 @@ Curl_Clear_forthismap
 Clears the "will disconnect on failure" flags.
 ====================
 */
-void Curl_Clear_forthismap()
+void Curl_Clear_forthismap(void)
 {
        downloadinfo *di;
        if(noclear)
@@ -261,12 +261,12 @@ Curl_Have_forthismap
 Returns true if a download needed for the current game is running.
 ====================
 */
-qboolean Curl_Have_forthismap()
+qboolean Curl_Have_forthismap(void)
 {
-       return numdownloads_added;
+       return numdownloads_added != 0;
 }
 
-void Curl_Register_predownload()
+void Curl_Register_predownload(void)
 {
        Curl_CommandWhenDone("cl_begindownloads");
        Curl_CommandWhenError("cl_begindownloads");
@@ -280,7 +280,7 @@ Checks if a "done command" is to be executed.
 All downloads finished, at least one success since connect, no single failure
 -> execute the command.
 */
-static void Curl_CheckCommandWhenDone()
+static void Curl_CheckCommandWhenDone(void)
 {
        if(!curl_dll)
                return;
@@ -441,6 +441,7 @@ CURL_DOWNLOAD_FAILED or CURL_DOWNLOAD_ABORTED) and in the second case the error
 code from libcurl, or 0, if another error has occurred.
 ====================
 */
+static qboolean Curl_Begin(const char *URL, const char *name, qboolean ispak, qboolean forthismap, unsigned char *buf, size_t bufsize, curl_callback_t callback, void *cbdata);
 static void Curl_EndDownload(downloadinfo *di, CurlStatus status, CURLcode error)
 {
        qboolean ok = false;
@@ -481,7 +482,7 @@ static void Curl_EndDownload(downloadinfo *di, CurlStatus status, CURLcode error
                qcurl_easy_cleanup(di->curle);
        }
 
-       if(ok && !di->bytes_received)
+       if(!di->callback && ok && !di->bytes_received)
        {
                Con_Printf("ERROR: empty file\n");
                ok = false;
@@ -500,6 +501,14 @@ static void Curl_EndDownload(downloadinfo *di, CurlStatus status, CURLcode error
                        // better clear the file again...
                        di->stream = FS_OpenRealFile(di->filename, "wb", false);
                        FS_Close(di->stream);
+
+                       if(di->startpos && !di->callback)
+                       {
+                               // this was a resume?
+                               // then try to redownload it without reporting the error
+                               Curl_Begin(di->url, di->filename, di->ispak, di->forthismap, NULL, 0, NULL, NULL);
+                               di->forthismap = false; // don't count the error
+                       }
                }
        }
 
@@ -530,7 +539,7 @@ To not start too many downloads at once, only one download is added at a time,
 up to a maximum number of cl_curl_maxdownloads are running.
 ====================
 */
-static void CheckPendingDownloads()
+static void CheckPendingDownloads(void)
 {
        if(!curl_dll)
                return;
@@ -594,7 +603,7 @@ this function MUST be called before using anything else in this file.
 On Win32, this must be called AFTER WSAStartup has been done!
 ====================
 */
-void Curl_Init()
+void Curl_Init(void)
 {
        CURL_OpenLibrary();
        if(!curl_dll)
@@ -610,8 +619,8 @@ Curl_Shutdown
 Surprise... closes all the stuff. Please do this BEFORE shutting down LHNET.
 ====================
 */
-void Curl_ClearRequirements();
-void Curl_Shutdown()
+void Curl_ClearRequirements(void);
+void Curl_Shutdown(void)
 {
        if(!curl_dll)
                return;
@@ -673,7 +682,7 @@ static qboolean Curl_Begin(const char *URL, const char *name, qboolean ispak, qb
        }
        else
        {
-               char fn[MAX_QPATH];
+               char fn[MAX_OSPATH];
                const char *p, *q;
                size_t length;
                downloadinfo *di;
@@ -786,7 +795,7 @@ static qboolean Curl_Begin(const char *URL, const char *name, qboolean ispak, qb
                // URL scheme (so one can't read local files using file://)
                if(strncmp(URL, "http://", 7) && strncmp(URL, "ftp://", 6) && strncmp(URL, "https://", 8))
                {
-                       Con_Printf("Curl_Begin(\"%s\")): nasty URL scheme rejected\n", URL);
+                       Con_Printf("Curl_Begin(\"%s\"): nasty URL scheme rejected\n", URL);
                        return false;
                }
 
@@ -801,7 +810,7 @@ static qboolean Curl_Begin(const char *URL, const char *name, qboolean ispak, qb
                di->startpos = 0;
                di->curle = NULL;
                di->started = false;
-               di->ispak = ispak;
+               di->ispak = (ispak && !buf);
                di->bytes_received = 0;
                di->next = downloads;
                di->prev = NULL;
@@ -843,7 +852,7 @@ call this regularily as this will always download as much as possible without
 blocking.
 ====================
 */
-void Curl_Run()
+void Curl_Run(void)
 {
        noclear = FALSE;
 
@@ -928,7 +937,7 @@ Curl_CancelAll
 Stops ALL downloads.
 ====================
 */
-void Curl_CancelAll()
+void Curl_CancelAll(void)
 {
        if(!curl_dll)
                return;
@@ -947,7 +956,7 @@ Curl_Running
 returns true iff there is a download running.
 ====================
 */
-qboolean Curl_Running()
+qboolean Curl_Running(void)
 {
        if(!curl_dll)
                return false;
@@ -1009,7 +1018,7 @@ prints the download list
 ====================
 */
 // TODO rewrite using Curl_GetDownloadInfo?
-static void Curl_Info_f()
+static void Curl_Info_f(void)
 {
        downloadinfo *di;
        if(!curl_dll)
@@ -1380,7 +1389,7 @@ static const char *Curl_FindPackURL(const char *filename)
 typedef struct requirement_s
 {
        struct requirement_s *next;
-       char filename[MAX_QPATH];
+       char filename[MAX_OSPATH];
 }
 requirement;
 static requirement *requirements = NULL;
@@ -1409,7 +1418,7 @@ Clears the list of required files for playing on the current map.
 This should be called at every map change.
 ====================
 */
-void Curl_ClearRequirements()
+void Curl_ClearRequirements(void)
 {
        const char *p;
        while(requirements)
@@ -1439,7 +1448,7 @@ This is done by sending him the following console commands:
        curl --finish_autodownload
 ====================
 */
-void Curl_SendRequirements()
+void Curl_SendRequirements(void)
 {
        // for each requirement, find the pack name
        char sendbuffer[4096] = "";