diff --git a/libzip/Include/zip.h b/libzip/Include/zip.h index b17600c..de4456c 100644 --- a/libzip/Include/zip.h +++ b/libzip/Include/zip.h @@ -3,7 +3,7 @@ /* zip.h -- exported declarations. - Copyright (C) 1999-2021 Dieter Baron and Thomas Klausner + Copyright (C) 1999-2024 Dieter Baron and Thomas Klausner This file is part of libzip, a library to manipulate ZIP archives. The authors can be contacted at @@ -34,6 +34,15 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#if defined(__has_feature) + #if !__has_feature(nullability) + #define _Nullable + #define _Nonnull + #endif +#else + #define _Nullable + #define _Nonnull +#endif #ifdef __cplusplus extern "C" { @@ -42,7 +51,7 @@ extern "C" { #endif #endif -#include "/EgtDev/Extern/libzip/Include/zipconf.h" +#include "zipconf.h" #ifndef ZIP_EXTERN #ifndef ZIP_STATIC @@ -112,6 +121,10 @@ extern "C" { #define ZIP_EXTRA_FIELD_ALL ZIP_UINT16_MAX #define ZIP_EXTRA_FIELD_NEW ZIP_UINT16_MAX +/* length parameter to various functions */ + +#define ZIP_LENGTH_TO_END 0 +#define ZIP_LENGTH_UNCHECKED (-2) /* only supported by zip_source_file and its variants */ /* libzip error codes */ @@ -150,6 +163,7 @@ extern "C" { #define ZIP_ER_CANCELLED 32 /* N Operation cancelled */ #define ZIP_ER_DATA_LENGTH 33 /* N Unexpected length of data */ #define ZIP_ER_NOT_ALLOWED 34 /* N Not allowed in torrentzip */ +#define ZIP_ER_TRUNCATED_ZIP 35 /* N Possibly truncated or corrupted zip archive */ /* type of system error value */ @@ -252,7 +266,8 @@ enum zip_source_cmd { ZIP_SOURCE_BEGIN_WRITE_CLONING, /* like ZIP_SOURCE_BEGIN_WRITE, but keep part of original file */ ZIP_SOURCE_ACCEPT_EMPTY, /* whether empty files are valid archives */ ZIP_SOURCE_GET_FILE_ATTRIBUTES, /* get additional file attributes */ - ZIP_SOURCE_SUPPORTS_REOPEN /* allow reading from changed entry */ + ZIP_SOURCE_SUPPORTS_REOPEN, /* allow reading from changed entry */ + ZIP_SOURCE_GET_DOS_TIME /* get last modification time in DOS format */ }; typedef enum zip_source_cmd zip_source_cmd_t; diff --git a/libzip/Include/zipconf.h b/libzip/Include/zipconf.h index 1c97661..9f1e77b 100644 --- a/libzip/Include/zipconf.h +++ b/libzip/Include/zipconf.h @@ -8,16 +8,13 @@ based on ../cmake-zipconf.h.in. */ -#define LIBZIP_VERSION "1.10.0" +#define LIBZIP_VERSION "1.11.4" #define LIBZIP_VERSION_MAJOR 1 -#define LIBZIP_VERSION_MINOR 10 -#define LIBZIP_VERSION_MICRO 0 +#define LIBZIP_VERSION_MINOR 11 +#define LIBZIP_VERSION_MICRO 4 /* #undef ZIP_STATIC */ -#define _Nullable -#define _Nonnull - #if !defined(__STDC_FORMAT_MACROS) #define __STDC_FORMAT_MACROS 1 #endif diff --git a/libzip/Lib/zipD32.lib b/libzip/Lib/zipD32.lib index f6e05f3..ece56e4 100644 Binary files a/libzip/Lib/zipD32.lib and b/libzip/Lib/zipD32.lib differ diff --git a/libzip/Lib/zipD32.pdb b/libzip/Lib/zipD32.pdb index 83ce649..1a5ea6a 100644 Binary files a/libzip/Lib/zipD32.pdb and b/libzip/Lib/zipD32.pdb differ diff --git a/libzip/Lib/zipD64.pdb b/libzip/Lib/zipD64.pdb index b63e44c..6093d36 100644 Binary files a/libzip/Lib/zipD64.pdb and b/libzip/Lib/zipD64.pdb differ diff --git a/libzip/Lib/zipR32.lib b/libzip/Lib/zipR32.lib index 14ce1e7..35bda8e 100644 Binary files a/libzip/Lib/zipR32.lib and b/libzip/Lib/zipR32.lib differ