Try to fix some warnings.

[dcpomatic.git] / src / lib / internet.cc

diff --git a/src/lib/internet.cc b/src/lib/internet.cc
index 846dbf7cae3fa7849e97e59ed6b126a1eba68281..4eba1efa3ada8762fc80a60ec684fa032c23ca6c 100644 (file)
--- a/src/lib/internet.cc
+++ b/src/lib/internet.cc
@@ -22,6 +22,7 @@
 #include "compose.hpp"
 #include "exceptions.h"
 #include "cross.h"
+#include "util.h"
 #include <curl/curl.h>
 #include <zip.h>
 #include <boost/function.hpp>
@@ -46,14 +47,13 @@ get_from_url_data (void* buffer, size_t size, size_t nmemb, void* stream)
        return fwrite (buffer, size, nmemb, f);
 }
 
-static
 optional<string>
 get_from_url (string url, bool pasv, ScopedTemporary& temp)
 {
        CURL* curl = curl_easy_init ();
        curl_easy_setopt (curl, CURLOPT_URL, url.c_str());
 
-       FILE* f = temp.open ("w");
+       FILE* f = temp.open ("wb");
        curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, get_from_url_data);
        curl_easy_setopt (curl, CURLOPT_WRITEDATA, f);
        curl_easy_setopt (curl, CURLOPT_FTP_USE_EPSV, 0);
@@ -120,9 +120,11 @@ get_from_zip_url (string url, string file, bool pasv, function<void (boost::file
                return optional<string> (_("Could not open downloaded ZIP file"));
        }
 
-       zip_t* zip = zip_open_from_source (zip_source, 0, 0);
+       zip_error_t error;
+       zip_error_init (&error);
+       zip_t* zip = zip_open_from_source (zip_source, ZIP_RDONLY, &error);
        if (!zip) {
-               return optional<string> (_("Could not open downloaded ZIP file"));
+               return String::compose (_("Could not open downloaded ZIP file (%1:%2: %3)"), error.zip_err, error.sys_err, error.str ? error.str : "");
        }
 
 #else
@@ -139,7 +141,7 @@ get_from_zip_url (string url, string file, bool pasv, function<void (boost::file
        char buffer[4096];
        while (true) {
                int const N = zip_fread (file_in_zip, buffer, sizeof (buffer));
-               fwrite (buffer, 1, N, f);
+               checked_fwrite (buffer, N, f, temp_cert.file());
                if (N < int (sizeof (buffer))) {
                        break;
                }