new command line option -modname to override DP's idea of com_modname (useful to...

[xonotic/darkplaces.git] / libcurl.c

diff --git a/libcurl.c b/libcurl.c
index f97946fe1bd2b365c1fe399d429837574eab03dc..0d3f6c7c061ae5c62baf58b20632a4a10b2371f5 100644 (file)
--- a/libcurl.c
+++ b/libcurl.c
@@ -170,7 +170,7 @@ static dllhandle_t curl_dll = NULL;
 typedef struct downloadinfo_s
 {
        char filename[MAX_QPATH];
-       char url[256];
+       char url[1024];
        char referer[256];
        qfile_t *stream;
        fs_offset_t startpos;
@@ -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;
@@ -491,7 +492,25 @@ static void Curl_EndDownload(downloadinfo *di, CurlStatus status, CURLcode error
                FS_Close(di->stream);
 
        if(ok && di->ispak)
+       {
                ok = FS_AddPack(di->filename, NULL, true);
+               if(!ok)
+               {
+                       // pack loading failed?
+                       // this is critical
+                       // 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
+                       }
+               }
+       }
 
        if(di->prev)
                di->prev->next = di->next;
@@ -748,7 +767,7 @@ static qboolean Curl_Begin(const char *URL, const char *name, qboolean ispak, qb
                                }
                                else
                                {
-                                       qfile_t *f = FS_OpenVirtualFile(fn, false);
+                                       qfile_t *f = FS_OpenRealFile(fn, "rb", false);
                                        if(f)
                                        {
                                                char buf[4] = {0};
@@ -776,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;
                }
 
@@ -791,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;
@@ -886,7 +905,7 @@ void Curl_Run()
                                                case 4: // e.g. 404?
                                                case 5: // e.g. 500?
                                                        failed = CURL_DOWNLOAD_SERVERERROR;
-                                                       result = code;
+                                                       result = (CURLcode) code;
                                                        break;
                                        }
                                }
@@ -962,7 +981,7 @@ static double Curl_GetDownloadAmount(downloadinfo *di)
                double length;
                qcurl_easy_getinfo(di->curle, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &length);
                if(length > 0)
-                       return di->bytes_received / length;
+                       return (di->startpos + di->bytes_received) / (di->startpos + length);
                else
                        return 0;
        }
@@ -1307,7 +1326,7 @@ this file for obvious reasons.
 */
 static const char *Curl_FindPackURL(const char *filename)
 {
-       static char foundurl[256];
+       static char foundurl[1024];
        fs_offset_t filesize;
        char *buf = (char *) FS_LoadFile("curl_urls.txt", tempmempool, true, &filesize);
        if(buf && filesize)