c/xlsxio
1
0
Fork 0
mirror of https://github.com/brechtsanders/xlsxio synced 2025-03-28 21:13:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #115 from captaingroove/minizip-ng

Browse Source 
Build with minizip-ng instead of minizip or libzip
This commit is contained in:
Brecht Sanders 2022-11-02 11:11:37 +01:00 committed by GitHub
commit 8e164d0515
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -22,6 +22,7 @@ OPTION(BUILD_PC_FILES "Build pkg-config .pc" ON)
OPTION(BUILD_TOOLS "Build tools" ON)
OPTION(BUILD_EXAMPLES "Build examples" ON)
OPTION(WITH_LIBZIP "Use libzip instead of Minizip" OFF)
OPTION(WITH_MINIZIP_NG "Use Minizip NG" OFF)
OPTION(WITH_WIDE "Also build UTF-16 library (libxlsxio_readw)" OFF)
SET(ZLIB_DIR "" CACHE PATH "Path to the zlib library")
IF(WITH_LIBZIP)
@ -50,10 +51,16 @@ IF(WITH_LIBZIP)
SET(ANYZIP_LIBRARIES ${LIBZIP_LIBRARIES})
SET(ANYZIP_DEF USE_LIBZIP)
ELSE()
FIND_PACKAGE(Minizip REQUIRED)
SET(ANYZIP_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS})
SET(ANYZIP_LIBRARIES ${MINIZIP_LIBRARIES})
SET(ANYZIP_DEF USE_MINIZIP)
IF(WITH_MINIZIP_NG)
FIND_PACKAGE(minizip REQUIRED)
SET(ANYZIP_LIBRARIES MINIZIP::minizip)
SET(ANYZIP_DEF USE_LIBZIP;USE_MINIZIP_NG)
ELSE()
FIND_PACKAGE(minizip REQUIRED)
SET(ANYZIP_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS})
SET(ANYZIP_LIBRARIES ${MINIZIP_LIBRARIES})
SET(ANYZIP_DEF USE_MINIZIP)
ENDIF()
ENDIF()
# dependancy: expat
IF(EXPAT_DIR)

14
lib/xlsxio_read.c
View File

@ -8,8 +8,12 @@
#include <string.h>
#include <expat.h>
#ifdef USE_MINIZIP
# include <minizip/unzip.h>
#if defined(USE_MINIZIP) || defined(USE_MINIZIP_NG)
# ifdef USE_MINIZIP_NG
# include <mz_compat.h>
# else
# include <minizip/unzip.h>
# endif
# define ZIPFILETYPE unzFile
# define ZIPFILEENTRYTYPE unzFile
# if defined(_MSC_VER)
@ -21,15 +25,15 @@
# define IOSIZETYPE ssize_t
# define IOFN(fn) fn
# endif
/*
# if !defined(Z_DEFLATED) && defined(MZ_COMPRESS_METHOD_DEFLATE) // support minizip2 which defines MZ_COMPRESS_METHOD_DEFLATE instead of Z_DEFLATED
# if defined(MZ_COMPRESS_METHOD_DEFLATE) // support minizip2 which defines MZ_COMPRESS_METHOD_DEFLATE instead of Z_DEFLATED
# ifndef ZCALLBACK
# define ZCALLBACK
# endif
# define voidpf void*
# define uLong unsigned long
# endif
*/
#else
# if (defined(STATIC) || defined(BUILD_XLSXIO_STATIC) || defined(BUILD_XLSXIO_STATIC_DLL) || (defined(BUILD_XLSXIO) && !defined(BUILD_XLSXIO_DLL) && !defined(BUILD_XLSXIO_SHARED))) && !defined(ZIP_STATIC)
# define ZIP_STATIC

22
lib/xlsxio_write.c
View File

@ -11,8 +11,12 @@
#include <fcntl.h>
#include <stdarg.h>
#ifdef USE_MINIZIP
# include <minizip/zip.h>
#if defined(USE_MINIZIP) || defined(USE_MINIZIP_NG)
# ifdef USE_MINIZIP_NG
# include <mz_compat.h>
# else
# include <minizip/zip.h>
# endif
# if !defined(Z_DEFLATED) && defined(MZ_COMPRESS_METHOD_DEFLATE) /* support minizip2 which defines MZ_COMPRESS_METHOD_DEFLATE instead of Z_DEFLATED */
# define Z_DEFLATED MZ_COMPRESS_METHOD_DEFLATE
# endif
@ -319,14 +323,14 @@ int zip_add_content_buffer (ZIPFILETYPE* zip, const char* filename, const char*
zip_fileinfo zipinfo;
time_t now = time(NULL);
struct tm* newtm = localtime(&now);
zipinfo.tmz_date.tm_sec = newtm->tm_sec;
zipinfo.tmz_date.tm_min = newtm->tm_min;
zipinfo.tmz_date.tm_hour = newtm->tm_hour;
zipinfo.tmz_date.tm_mday = newtm->tm_mday;
zipinfo.tmz_date.tm_mon = newtm->tm_mon;
zipinfo.tmz_date.tm_sec = newtm->tm_sec;
zipinfo.tmz_date.tm_min = newtm->tm_min;
zipinfo.tmz_date.tm_hour = newtm->tm_hour;
zipinfo.tmz_date.tm_mday = newtm->tm_mday;
zipinfo.tmz_date.tm_mon = newtm->tm_mon;
zipinfo.tmz_date.tm_year = newtm->tm_year;
zipinfo.dosDate = 0;
zipinfo.internal_fa = 0;
zipinfo.dosDate = 0;
zipinfo.internal_fa = 0;
zipinfo.external_fa = 0;
if (zipOpenNewFileInZip(zip, filename, &zipinfo, NULL, 0, NULL, 0, NULL, Z_DEFLATED, 9) != ZIP_OK) {
fprintf(stderr, "Error creating file \"%s\" inside zip file\n", filename);/////