#include "compose.hpp"
#include "exceptions.h"
#include "cross.h"
+#include "util.h"
#include <curl/curl.h>
#include <zip.h>
#include <boost/function.hpp>
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);
}
zip_error_t error;
+ zip_error_init (&error);
zip_t* zip = zip_open_from_source (zip_source, ZIP_RDONLY, &error);
if (!zip) {
- return String::compose (_("Could not open downloaded ZIP file (%1)"), error.str ? error.str : "");
+ return String::compose (_("Could not open downloaded ZIP file (%1:%2: %3)"), error.zip_err, error.sys_err, error.str ? error.str : "");
}
#else
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;
}