Note that newer libsub version is required.

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

diff --git a/src/lib/zipper.cc b/src/lib/zipper.cc
index d095a27bb6d74d24dd65110393086569d85330e8..625f3049a52a76df41c13d5bd94a49cfa6f6f3af 100644 (file)
--- a/src/lib/zipper.cc
+++ b/src/lib/zipper.cc
@@ -19,23 +19,24 @@
 */
 
 
-#include "zipper.h"
-#include "exceptions.h"
 #include "dcpomatic_assert.h"
+#include "exceptions.h"
+#include "zipper.h"
+#include <dcp/filesystem.h>
 #include <zip.h>
 #include <boost/filesystem.hpp>
 #include <stdexcept>
 
 
-using std::string;
 using std::runtime_error;
 using std::shared_ptr;
+using std::string;
 
 
 Zipper::Zipper (boost::filesystem::path file)
 {
        int error;
-       _zip = zip_open (file.string().c_str(), ZIP_CREATE | ZIP_EXCL, &error);
+       _zip = zip_open(dcp::filesystem::fix_long_path(file).string().c_str(), ZIP_CREATE | ZIP_EXCL, &error);
        if (!_zip) {
                if (error == ZIP_ER_EXISTS) {
                        throw FileError ("ZIP file already exists", file);
@@ -56,7 +57,11 @@ Zipper::add (string name, string content)
                throw runtime_error ("could not create ZIP source");
        }
 
+#ifdef DCPOMATIC_HAVE_ZIP_FILE_ADD
+       if (zip_file_add(_zip, name.c_str(), source, ZIP_FL_ENC_GUESS) == -1) {
+#else
        if (zip_add(_zip, name.c_str(), source) == -1) {
+#endif
                throw runtime_error(String::compose("failed to add data to ZIP archive (%1)", zip_strerror(_zip)));
        }
 }