fix: check zip_source_t

Signed-off-by: imkiva <[email protected]>

Author: imkiva

CMakeLists.txt

@@ -85,6 +85,8 @@ if (HAVE_ZIP_H)
         int main(int argc, char *argv[]) { zip_flags_t flag = 0; }" HAVE_ZIP_FLAGS_T)
     check_c_source_compiles("#include <zip.h>
         int main(int argc, char *argv[]) { unsigned int flag = ZIP_FL_ENC_GUESS; }" HAVE_ZIP_FL_ENC_GUESS)
+    check_c_source_compiles("#include <zip.h>
+        int main(int argc, char *argv[]) { zip_source_t *src; }" HAVE_ZIP_SOURCE_T)
 
     # check libz if libzip is required
     if (NOT EXISTS "/system/framework/framework-res.apk")

cmake/cmake-config.h.in

@@ -3,6 +3,7 @@
 #ifdef HAVE_CONFIG_H
 
 #cmakedefine01 HAVE_ZIP_FLAGS_T
+#cmakedefine01 HAVE_ZIP_SOURCE_T
 #cmakedefine01 HAVE_ZIP_FL_ENC_GUESS
 #cmakedefine01 HAVE_ZIP_H
 #cmakedefine01 KIVM_THREADED
@@ -21,6 +22,9 @@
 
 #if HAVE_ZIP_H
 #define KIVM_JAR_CLASS_LOADING
+#if HAVE_ZIP_SOURCE_T
+#define KIVM_ZIP_OPEN_SOURCE
+#endif
 #endif
 
 #if KIVM_ARCH_x86_64 || KIVM_ARCH_x86

include/shared/zip/libzippp.h

@@ -42,7 +42,10 @@
 
 //defined in libzip
 struct zip;
+
+#ifdef KIVM_ZIP_OPEN_SOURCE
 struct zip_source;
+#endif
 
 #define DIRECTORY_SEPARATOR '/'
 #define IS_DIRECTORY(str) ((str).length()>0 && (str)[(str).length()-1]==DIRECTORY_SEPARATOR)
@@ -131,7 +134,9 @@ namespace libzippp {
          */
         explicit ZipArchive(const kivm::String &zipPath);
 
+#ifdef KIVM_ZIP_OPEN_SOURCE
         explicit ZipArchive(const kivm::String &bufferName, void *buffer, size_t bufferSize);
+#endif
 
         ~ZipArchive(); //commit all the changes if open
 
@@ -267,9 +272,12 @@ namespace libzippp {
     private:
         std::string path;
         zip *zipHandle;
+
+#ifdef KIVM_ZIP_OPEN_SOURCE
         zip_source *zipSource;
         void *zipBuffer;
         size_t zipBufferSize;
+#endif
         OpenMode mode;
 
         //generic method to create ZipEntry

src/shared/zip/libzippp.cpp

@@ -80,12 +80,15 @@ int ZipEntry::readContent(std::ofstream &ofOutput, ZipArchive::State state, libz
 ZipArchive::ZipArchive(const kivm::String &zipPath)
     : path(kivm::strings::toStdString(zipPath)),
       zipHandle(nullptr),
-      mode(NOT_OPEN),
-      zipBuffer(nullptr),
-      zipBufferSize(0),
-      zipSource(nullptr) {
+#ifdef KIVM_ZIP_OPEN_SOURCE
+zipBuffer(nullptr),
+zipBufferSize(0),
+zipSource(nullptr),
+#endif
+      mode(NOT_OPEN) {
 }
 
+#ifdef KIVM_ZIP_OPEN_SOURCE
 ZipArchive::ZipArchive(const kivm::String &bufferName, void *buffer, size_t bufferSize)
     : path(kivm::strings::toStdString(bufferName)),
       zipHandle(nullptr),
@@ -94,6 +97,7 @@ ZipArchive::ZipArchive(const kivm::String &bufferName, void *buffer, size_t buff
       zipBufferSize(bufferSize),
       zipSource(nullptr) {
 }
+#endif
 
 ZipArchive::~ZipArchive() {
     close(); /* discard ??? */
@@ -113,6 +117,7 @@ bool ZipArchive::open(OpenMode om, bool checkConsistency) {
 
     int errorFlag = 0;
 
+#ifdef KIVM_ZIP_OPEN_SOURCE
     if (zipBuffer == nullptr) {
         zipHandle = zip_open(path.c_str(), zipFlag, &errorFlag);
 
@@ -133,6 +138,9 @@ bool ZipArchive::open(OpenMode om, bool checkConsistency) {
             }
         }
     }
+#else
+    zipHandle = zip_open(path.c_str(), zipFlag, &errorFlag);
+#endif
 
     //error during opening of the file
     if (errorFlag != ZIP_ER_OK) {
@@ -153,10 +161,12 @@ int ZipArchive::close() {
         int result = zip_close(zipHandle);
         zipHandle = nullptr;
 
+#ifdef KIVM_ZIP_OPEN_SOURCE
         if (zipBuffer != nullptr && zipSource != nullptr) {
             zip_source_free(zipSource);
             zipSource = nullptr;
         }
+#endif
         mode = NOT_OPEN;
 
         if (result != 0) { return result; }