summaryrefslogtreecommitdiff
path: root/Build/source/libs/zziplib/zziplib-src/zzip
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2018-03-18 00:25:18 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2018-03-18 00:25:18 +0000
commite62a7bd0553ee23d5ff91ef2fa89a5558ccc58db (patch)
tree8e0b25559cc31478e6d19f21fe10cac841e5b327 /Build/source/libs/zziplib/zziplib-src/zzip
parentde28cbce128eea40f3e90af96d0e1807b742c3a6 (diff)
zziplib-0.13.69
git-svn-id: svn://tug.org/texlive/trunk@47004 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/zziplib/zziplib-src/zzip')
-rw-r--r--Build/source/libs/zziplib/zziplib-src/zzip/Makefile.in37
-rw-r--r--Build/source/libs/zziplib/zziplib-src/zzip/__fnmatch.h37
-rw-r--r--Build/source/libs/zziplib/zziplib-src/zzip/__mmap.h34
-rw-r--r--Build/source/libs/zziplib/zziplib-src/zzip/__string.h26
-rw-r--r--Build/source/libs/zziplib/zziplib-src/zzip/dir.c15
-rw-r--r--Build/source/libs/zziplib/zziplib-src/zzip/fetch.c2
-rw-r--r--Build/source/libs/zziplib/zziplib-src/zzip/file.c44
-rw-r--r--Build/source/libs/zziplib/zziplib-src/zzip/info.c19
-rw-r--r--Build/source/libs/zziplib/zziplib-src/zzip/lib.h1
-rw-r--r--Build/source/libs/zziplib/zziplib-src/zzip/memdisk.c70
-rw-r--r--Build/source/libs/zziplib/zziplib-src/zzip/mmapped.c14
-rw-r--r--Build/source/libs/zziplib/zziplib-src/zzip/mmapped.h4
-rw-r--r--Build/source/libs/zziplib/zziplib-src/zzip/plugin.c6
-rw-r--r--Build/source/libs/zziplib/zziplib-src/zzip/plugin.h4
-rw-r--r--Build/source/libs/zziplib/zziplib-src/zzip/stat.c6
-rw-r--r--Build/source/libs/zziplib/zziplib-src/zzip/stdint.h13
-rw-r--r--Build/source/libs/zziplib/zziplib-src/zzip/zip.c55
-rw-r--r--Build/source/libs/zziplib/zziplib-src/zzip/zzip-zlib-config.pc8
-rw-r--r--Build/source/libs/zziplib/zziplib-src/zzip/zzipfseeko.pc18
-rw-r--r--Build/source/libs/zziplib/zziplib-src/zzip/zziplib.pc18
-rw-r--r--Build/source/libs/zziplib/zziplib-src/zzip/zzipmmapped.pc18
21 files changed, 249 insertions, 200 deletions
diff --git a/Build/source/libs/zziplib/zziplib-src/zzip/Makefile.in b/Build/source/libs/zziplib/zziplib-src/zzip/Makefile.in
index 8a835ab1bc7..1861ffecc70 100644
--- a/Build/source/libs/zziplib/zziplib-src/zzip/Makefile.in
+++ b/Build/source/libs/zziplib/zziplib-src/zzip/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -16,7 +16,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -81,9 +91,6 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
subdir = zzip
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/uses/mkinstalldirs $(top_srcdir)/uses/depcomp \
- $(noinst_HEADERS) $(pkgconfig_HEADERS) $(zzip_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_compile_check_sizeof.m4 \
$(top_srcdir)/m4/ac_set_default_paths_system.m4 \
@@ -94,6 +101,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_compile_check_sizeof.m4 \
$(top_srcdir)/m4/ax_cflags_strict_prototypes.m4 \
$(top_srcdir)/m4/ax_cflags_warn_all.m4 \
$(top_srcdir)/m4/ax_check_aligned_access_required.m4 \
+ $(top_srcdir)/m4/ax_check_enable_debug.m4 \
$(top_srcdir)/m4/ax_configure_args.m4 \
$(top_srcdir)/m4/ax_create_pkgconfig_info.m4 \
$(top_srcdir)/m4/ax_enable_builddir.m4 \
@@ -116,6 +124,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_compile_check_sizeof.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
+ $(pkgconfig_HEADERS) $(zzip_HEADERS) $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) $(top_srcdir)/uses/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_VPATH_FILES =
@@ -236,12 +246,16 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/uses/depcomp \
+ $(top_srcdir)/uses/mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
AS = @AS@
+ASAN_CFLAGS = @ASAN_CFLAGS@
+ASAN_LIBS = @ASAN_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -281,8 +295,10 @@ LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKZIP = @MKZIP@
NM = @NM@
@@ -329,6 +345,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
aclocaldir = @aclocaldir@
@@ -363,7 +380,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -507,7 +523,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign zzip/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign zzip/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -594,14 +609,14 @@ distclean-compile:
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -872,6 +887,8 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-local \
uninstall-am uninstall-libLTLIBRARIES uninstall-local \
uninstall-pkgconfigHEADERS uninstall-zzipHEADERS
+.PRECIOUS: Makefile
+
# here is some backward compatibility with version 0.10.* of zziplib
install-data-hook : install-zzipHEADERS
diff --git a/Build/source/libs/zziplib/zziplib-src/zzip/__fnmatch.h b/Build/source/libs/zziplib/zziplib-src/zzip/__fnmatch.h
index 59cea887682..6e9443c0fea 100644
--- a/Build/source/libs/zziplib/zziplib-src/zzip/__fnmatch.h
+++ b/Build/source/libs/zziplib/zziplib-src/zzip/__fnmatch.h
@@ -7,20 +7,43 @@
#include <string.h>
#ifdef ZZIP_HAVE_FNMATCH_H
-#include <fnmatch.h>
-#endif
-
-#ifdef ZZIP_HAVE_FNMATCH_H
-#define _zzip_fnmatch fnmatch
+# include <fnmatch.h>
+# define _zzip_fnmatch fnmatch
# ifdef FNM_CASEFOLD
# define _zzip_FNM_CASEFOLD FNM_CASEFOLD
# else
# define _zzip_FNM_CASEFOLD 0
# endif
+# ifdef FNM_NOESCAPE
+# define _zzip_FNM_NOESCAPE FNM_NOESCAPE
+# else
+# define _zzip_FNM_NOESCAPE 0
+# endif
+# ifdef FNM_PATHNAME
+# define _zzip_FNM_PATHNAME FNM_PATHNAME
+# else
+# define _zzip_FNM_PATHNAME 0
+# endif
+# ifdef FNM_PERIOD
+# define _zzip_FNM_PERIOD FNM_PERIOD
+# else
+# define _zzip_FNM_PERIOD 0
+# endif
+
#else
-# define _zzip_FNM_CASEFOLD 0
/* if your system does not have fnmatch, we fall back to strcmp: */
-#define _zzip_fnmatch(x,y,z) strcmp ((x),(y))
+static int _zzip_fnmatch(char* pattern, char* string, int flags)
+{
+# ifdef DBG2
+ DBG1("<zzip:mmapped:strcmp>");
+# endif
+ return strcmp (pattern, string);
+}
+
+# define _zzip_FNM_CASEFOLD 0
+# define _zzip_FNM_NOESCAPE 0
+# define _zzip_FNM_PATHNAME 0
+# define _zzip_FNM_PERIOD 0
#endif
#endif
diff --git a/Build/source/libs/zziplib/zziplib-src/zzip/__mmap.h b/Build/source/libs/zziplib/zziplib-src/zzip/__mmap.h
index 7786b4897cf..80c976d242c 100644
--- a/Build/source/libs/zziplib/zziplib-src/zzip/__mmap.h
+++ b/Build/source/libs/zziplib/zziplib-src/zzip/__mmap.h
@@ -44,62 +44,42 @@
#ifndef MAP_FAILED
#define MAP_FAILED 0
#endif
-/* we (ab)use the "*user" variable to store the FileMapping handle */
- /* and make sure (sizeof(*user) == sizeof(HANDLE)) */
+/* we had used the plugin->sys variable for (user) but not anymore */
static size_t win32_getpagesize (void)
{
SYSTEM_INFO si; GetSystemInfo (&si);
return si.dwAllocationGranularity;
}
-#ifdef _WIN64
-static void* win32_mmap (__int64* user, int fd, zzip_off_t offs, size_t len)
-#else
static void* win32_mmap (long* user, int fd, zzip_off_t offs, size_t len)
-#endif
{
if (! user || *user != 1) /* || offs % getpagesize() */
return 0;
{
HANDLE hFile = (HANDLE)_get_osfhandle(fd);
+ HANDLE fileMapping = NULL;
if (hFile)
-#ifdef _WIN64
- *user = (__int64) CreateFileMapping (hFile, 0, PAGE_READONLY, 0, 0, NULL);
-#else
- *user = (long) CreateFileMapping (hFile, 0, PAGE_READONLY, 0, 0, NULL);
-#endif
- if (*user)
+ fileMapping = CreateFileMapping (hFile, 0, PAGE_READONLY, 0, 0, NULL);
+ if (fileMapping != NULL)
{
- char* p = 0;
- p = MapViewOfFile(*(HANDLE*)user, FILE_MAP_READ, 0, offs, len);
+ char* p = MapViewOfFile(fileMapping, FILE_MAP_READ, 0, offs, len);
+ CloseHandle (fileMapping); *user = 1;
if (p) return p;
- CloseHandle (*(HANDLE*)user); *user = 1;
}
return MAP_FAILED;
}
}
-#ifdef _WIN64
-static void win32_munmap (__int64* user, char* fd_map, size_t len)
-#else
static void win32_munmap (long* user, char* fd_map, size_t len)
-#endif
{
UnmapViewOfFile (fd_map);
- CloseHandle (*(HANDLE*)user); *user = 1;
}
-#ifdef _WIN64
-#define _zzip_mmap(user, fd, offs, len) \
- win32_mmap ((__int64*) &(user), fd, offs, len)
-#define _zzip_munmap(user, ptr, len) \
- win32_munmap ((__int64*) &(user), ptr, len)
-#else
#define _zzip_mmap(user, fd, offs, len) \
win32_mmap ((long*) &(user), fd, offs, len)
#define _zzip_munmap(user, ptr, len) \
win32_munmap ((long*) &(user), ptr, len)
-#endif
#define _zzip_getpagesize(user) win32_getpagesize()
+
#else /* disable */
#define USE_MMAP 0
/* USE_MAP is intentional: we expect the compiler to do some "code removal"
diff --git a/Build/source/libs/zziplib/zziplib-src/zzip/__string.h b/Build/source/libs/zziplib/zziplib-src/zzip/__string.h
index f5b7cb8703c..cd567142fc5 100644
--- a/Build/source/libs/zziplib/zziplib-src/zzip/__string.h
+++ b/Build/source/libs/zziplib/zziplib-src/zzip/__string.h
@@ -13,20 +13,24 @@
#include <strings.h>
#endif
-
-#if defined ZZIP_HAVE_STRNDUP || defined strndup
-#define _zzip_strndup strndup
+#if defined ZZIP_HAVE_STRNLEN || defined strnlen
+#define _zzip_strnlen strnlen
#else
+#include <stdlib.h>
-static size_t my_strnlen(const char* str, size_t maxlen)
+/* if your system does not have strnlen: */
+zzip__new__ static size_t
+_zzip_strnlen(const char *p, size_t maxlen)
{
- char *p = memchr(str, 0, maxlen);
- if (p == NULL)
- return maxlen;
- else
- return (p - str);
+ const char * stop = (char *)memchr(p, '\0', maxlen);
+ return stop ? stop - p : maxlen;
}
-#define strnlen(x,y) my_strnlen((x),(y))
+#endif
+
+
+#if defined ZZIP_HAVE_STRNDUP || defined strndup
+#define _zzip_strndup strndup
+#else
/* if your system does not have strndup: */
zzip__new__ static char *
@@ -37,7 +41,7 @@ _zzip_strndup(char const *p, size_t maxlen)
return p;
} else
{
- size_t len = strnlen(p, maxlen);
+ size_t len = _zzip_strnlen(p, maxlen);
char* r = malloc(len + 1);
if (r == NULL)
return NULL; /* errno = ENOMEM */
diff --git a/Build/source/libs/zziplib/zziplib-src/zzip/dir.c b/Build/source/libs/zziplib/zziplib-src/zzip/dir.c
index 845bd5c7dea..7ae95ddb5c3 100644
--- a/Build/source/libs/zziplib/zziplib-src/zzip/dir.c
+++ b/Build/source/libs/zziplib/zziplib-src/zzip/dir.c
@@ -37,7 +37,8 @@
# endif
#endif
-/**
+/** rewind.
+ *
* This function is the equivalent of a => rewinddir(2) for a realdir or
* the zipfile in place of a directory. The ZZIP_DIR handle returned from
* => zzip_opendir has a flag saying realdir or zipfile. As for a zipfile,
@@ -105,7 +106,8 @@ real_readdir(ZZIP_DIR * dir)
}
#endif
-/**
+/** read dir.
+ *
* This function is the equivalent of a => readdir(2) for a realdir
* or a zipfile referenced by the ZZIP_DIR returned from => zzip_opendir.
*
@@ -216,15 +218,17 @@ zzip_seekdir32(ZZIP_DIR * dir, long offset)
}
#if defined ZZIP_LARGEFILE_RENAME && defined EOVERFLOW && defined PIC
+/* DLL compatibility layer - so that 32bit code can link with a 64on32 too */
+
#undef zzip_seekdir /* zzip_seekdir64 */
#undef zzip_telldir /* zzip_telldir64 */
-/* DLL compatibility layer - so that 32bit code can link with a 64on32 too */
long zzip_telldir(ZZIP_DIR * dir) { return zzip_telldir32(dir); }
void zzip_seekdir(ZZIP_DIR * dir, long offset) { zzip_seekdir32(dir, offset); }
#endif
-/**
+/** start usage.
+ *
* This function is the equivalent of => opendir(3) for a realdir or zipfile.
*
* This function has some magic - if the given argument-path
@@ -293,7 +297,8 @@ zzip_opendir_ext_io(zzip_char_t * filename, int o_modes,
return dir;
}
-/**
+/** stop usage.
+ *
* This function is the equivalent of => closedir(3) for a realdir or zipfile.
*
* This function is magic - if the given arg-ZZIP_DIR
diff --git a/Build/source/libs/zziplib/zziplib-src/zzip/fetch.c b/Build/source/libs/zziplib/zziplib-src/zzip/fetch.c
index 91a5e5921d9..00a9e27c3b6 100644
--- a/Build/source/libs/zziplib/zziplib-src/zzip/fetch.c
+++ b/Build/source/libs/zziplib/zziplib-src/zzip/fetch.c
@@ -14,7 +14,7 @@
/* ------------------------- fetch helpers --------------------------------- */
-/**
+/** internal.
* Make 32 bit value in host byteorder from little-endian mapped octet-data
* (works also on machines which SIGBUS on misaligned data access (eg. 68000))
*/
diff --git a/Build/source/libs/zziplib/zziplib-src/zzip/file.c b/Build/source/libs/zziplib/zziplib-src/zzip/file.c
index fb91d9815d0..ae161a74f4f 100644
--- a/Build/source/libs/zziplib/zziplib-src/zzip/file.c
+++ b/Build/source/libs/zziplib/zziplib-src/zzip/file.c
@@ -30,8 +30,8 @@
#define tells(fd) seeks(fd,0,SEEK_CUR)
#endif
-/**
- * the direct function of => zzip_close(fp). it will cleanup the
+/** end usage.
+ * This function is the direct call of => zzip_close(fp). It will cleanup the
* inflate-portion of => zlib and free the structure given.
*
* it is called quite from the error-cleanup parts
@@ -163,9 +163,9 @@ dirsep_strcasecmp(zzip_char_t * s1, zzip_char_t * s2)
static int zzip_inflate_init(ZZIP_FILE *, struct zzip_dir_hdr *);
-/**
- * open an => ZZIP_FILE from an already open => ZZIP_DIR handle. Since
- * we have a chance to reuse a cached => buf32k and => ZZIP_FILE memchunk
+/** start usage.
+ * This function opens an => ZZIP_FILE from an already open => ZZIP_DIR handle.
+ * Since we have a chance to reuse a cached => buf32k and => ZZIP_FILE memchunk
* this is the best choice to unpack multiple files.
*
* Note: the zlib supports 2..15 bit windowsize, hence we provide a 32k
@@ -305,7 +305,7 @@ zzip_file_open(ZZIP_DIR * dir, zzip_char_t * name, int o_mode)
return NULL;
}
-/**
+/** internal.
* call => inflateInit and setup fp's iterator variables,
* used by lowlevel => _open functions.
*/
@@ -334,7 +334,7 @@ zzip_inflate_init(ZZIP_FILE * fp, struct zzip_dir_hdr *hdr)
return err;
}
-/**
+/** end usage.
* This function closes the given ZZIP_FILE handle.
*
* If the ZZIP_FILE wraps a normal stat'fd then it is just that int'fd
@@ -359,10 +359,10 @@ zzip_close(ZZIP_FILE * fp)
return zzip_fclose(fp);
}
-/**
- * This functions read data from zip-contained file.
+/** read data.
+ * This function reads data from zip-contained file.
*
- * It works like => read(2) and will fill the given buffer with bytes from
+ * This fuction works like => read(2) and will fill the given buffer with bytes from
* the opened file. It will return the number of bytes read, so if the => EOF
* is encountered you will be prompted with the number of bytes actually read.
*
@@ -456,11 +456,11 @@ zzip_file_read(ZZIP_FILE * fp, void *buf, zzip_size_t len)
}
}
-/**
+/** read data.
* This function will read(2) data from a real/zipped file.
*
- * the replacement for => read(2) will fill the given buffer with bytes from
- * the opened file. It will return the number of bytes read, so if the EOF
+ * This function is the replacement for => read(2) will fill the given buffer with
+ * bytes from the opened file. It will return the number of bytes read, so if the EOF
* is encountered you will be prompted with the number of bytes actually read.
*
* If the file-handle is wrapping a stat'able file then it will actually just
@@ -515,7 +515,7 @@ zzip_fread(void *ptr, zzip_size_t size, zzip_size_t nmemb, ZZIP_FILE * file)
/* ------------------------------------------------------------------- */
-/** also: fopen(2)
+/** start usage. also: fopen(2)
* This function will => fopen(3) a real/zipped file.
*
* It has some magic functionality builtin - it will first try to open
@@ -654,7 +654,7 @@ zzip_freopen(zzip_char_t * filename, zzip_char_t * mode, ZZIP_FILE * stream)
}
}
-/**
+/** start usage.
* This function will => open(2) a real/zipped file
*
* It has some magic functionality builtin - it will first try to open
@@ -864,6 +864,9 @@ zzip_open_shared_io(ZZIP_FILE * stream,
}
#if defined ZZIP_LARGEFILE_RENAME && defined EOVERFLOW && defined PIC
+
+/* DLL compatibility layer - so that 32bit code can link with this lib too */
+
#undef zzip_open_shared_io /* zzip_open_shared_io64 */
#undef zzip_open_ext_io /* zzip_open_ext_io64 */
#undef zzip_opendir_ext_io /* zzip_opendir_ext_io64 */
@@ -878,8 +881,6 @@ ZZIP_FILE *zzip_open_ext_io(zzip_char_t * name, int o_flags,
ZZIP_DIR *zzip_opendir_ext_io(zzip_char_t * name, int o_modes,
zzip_strings_t * ext, zzip_plugin_io_t io);
-/* DLL compatibility layer - so that 32bit code can link with this lib too */
-
ZZIP_FILE *
zzip_open_shared_io(ZZIP_FILE * stream,
zzip_char_t * name, int o_flags,
@@ -915,7 +916,8 @@ zzip_opendir_ext_io(zzip_char_t * name, int o_modes,
/* ------------------------------------------------------------------- */
-/**
+/** rewind.
+ *
* This function will rewind a real/zipped file.
*
* It seeks to the beginning of this file's data in the zip,
@@ -975,7 +977,8 @@ zzip_rewind(ZZIP_FILE * fp)
return err;
}
-/**
+/** seek.
+ *
* This function will perform a => lseek(2) operation on a real/zipped file
*
* It will try to seek to the offset specified by offset, relative to whence,
@@ -1098,7 +1101,8 @@ zzip_seek(ZZIP_FILE * fp, zzip_off_t offset, int whence)
return zzip_tell(fp);
}
-/**
+/** tell.
+ *
* This function will => tell(2) the current position in a real/zipped file
*
* It will return the current offset within the real/zipped file,
diff --git a/Build/source/libs/zziplib/zziplib-src/zzip/info.c b/Build/source/libs/zziplib/zziplib-src/zzip/info.c
index ab226bc9a20..24825762775 100644
--- a/Build/source/libs/zziplib/zziplib-src/zzip/info.c
+++ b/Build/source/libs/zziplib/zziplib-src/zzip/info.c
@@ -17,8 +17,8 @@
#include <stdio.h>
#endif
-/**
- * just returns dir->errcode of the ZZIP_DIR handle
+/** get errror status.
+ * This function just returns dir->errcode of the ZZIP_DIR handle
* see: => zzip_dir_open, => zzip_dir_open, => zzip_readdir, => zzip_dir_read
*/
int
@@ -33,8 +33,8 @@ zzip_error(ZZIP_DIR * dir)
void
zzip_seterror(ZZIP_DIR * dir, int errcode) { dir->errcode = errcode; }
-/**
- * This function will just return fp->dir
+/** get handle.
+ * This function will just return the fp->dir value.
*
* If a ZZIP_FILE is contained within a zip-file that one will be a valid
* pointer, otherwise a NULL is returned and the ZZIP_FILE wraps a real file.
@@ -58,18 +58,19 @@ zzip_dirfd(ZZIP_DIR * dir)
return dir->fd;
}
+#define LENGTH(x) (sizeof(x) / sizeof(*x))
static const char* comprlevel[] = {
"stored", "shrunk", "redu:1", "redu:2", "redu:3", "redu:4",
"impl:N", "toknze", "defl:N", "defl:B", "impl:B" };
-/**
- * return static const string of the known compression methods,
- * otherwise just "zipped" is returned
+/** compr name.
+ * This function returns the static const string of the known compression methods,
+ * Unknown id values will return just "zipped" as the string code.
*/
zzip_char_t *
zzip_compr_str(int compr)
{
- if (0 <= compr && compr < sizeof(comprlevel))
+ if (0 <= compr && compr < LENGTH(comprlevel))
{
return comprlevel[compr];
} else if (0 < compr && compr < 256)
@@ -110,7 +111,7 @@ zzip_dir_real(ZZIP_DIR * dir)
return dir->realdir != 0;
}
-/**
+/** check real or zipped file.
* This function checks if the ZZIP_FILE-handle is wrapping
* a real file or a zip-contained file.
* Returns 1 for a stat'able file, and 0 for a file inside a zip-archive.
diff --git a/Build/source/libs/zziplib/zziplib-src/zzip/lib.h b/Build/source/libs/zziplib/zziplib-src/zzip/lib.h
index b09a1302829..4a02f5473e4 100644
--- a/Build/source/libs/zziplib/zziplib-src/zzip/lib.h
+++ b/Build/source/libs/zziplib/zziplib-src/zzip/lib.h
@@ -16,7 +16,6 @@
#include <zzip/zzip.h>
#include <zzip/plugin.h>
#include <zzip/stdint.h>
-#include <zzip/zzip32.h>
#ifdef __cplusplus
extern "C" {
diff --git a/Build/source/libs/zziplib/zziplib-src/zzip/memdisk.c b/Build/source/libs/zziplib/zziplib-src/zzip/memdisk.c
index 29b2a1b1b05..8d5743d7972 100644
--- a/Build/source/libs/zziplib/zziplib-src/zzip/memdisk.c
+++ b/Build/source/libs/zziplib/zziplib-src/zzip/memdisk.c
@@ -69,6 +69,9 @@ zzip_mem_entry_new(ZZIP_DISK * disk, ZZIP_DISK_ENTRY * entry);
static void
zzip_mem_entry_free(ZZIP_MEM_ENTRY * _zzip_restrict item);
+/** => zzip_mem_disk_open
+ * This function is internally used to prepare opening a disk.
+ */
zzip__new__ ZZIP_MEM_DISK *
zzip_mem_disk_new(void)
{
@@ -76,7 +79,8 @@ zzip_mem_disk_new(void)
}
/** create new diskdir handle.
- * wraps underlying zzip_disk_open. */
+ * This function wraps underlying zzip_disk_open.
+ */
zzip__new__ ZZIP_MEM_DISK *
zzip_mem_disk_open(char *filename)
{
@@ -95,8 +99,9 @@ zzip_mem_disk_open(char *filename)
____;
}
-/** create new diskdir handle.
- * wraps underlying zzip_disk_open. */
+/** => zzip_mem_disk_open
+ * This function wraps the underlying zzip_disk_open.
+ */
zzip__new__ ZZIP_MEM_DISK *
zzip_mem_disk_fdopen(int fd)
{
@@ -116,7 +121,8 @@ zzip_mem_disk_fdopen(int fd)
}
/** create new diskdir handle.
- * wraps underlying zzip_disk_buffer. */
+ * This function wraps underlying zzip_disk_buffer.
+ */
zzip__new__ ZZIP_MEM_DISK *
zzip_mem_disk_buffer(char *buffer, size_t buflen)
{
@@ -148,6 +154,7 @@ zzip_mem_disk_load(ZZIP_MEM_DISK * dir, ZZIP_DISK * disk)
zzip_mem_disk_unload(dir);
___ long count = 0;
___ struct zzip_disk_entry *entry = zzip_disk_findfirst(disk);
+ if (!entry) goto error;
for (; entry; entry = zzip_disk_findnext(disk, entry))
{
ZZIP_MEM_ENTRY *item = zzip_mem_entry_new(disk, entry);
@@ -298,7 +305,8 @@ zzip_mem_entry_extra_block(ZZIP_MEM_ENTRY * entry, short datatype)
return zzip_mem_entry_find_extra_block(entry, datatype, 16);
}
-/* find an extra block for the given datatype code.
+/* get extra block.
+ * This function finds an extra block for the given datatype code.
* The returned EXTRA_BLOCK is still in disk-encoding but
* already a pointer into an allocated heap space block.
*
@@ -315,7 +323,14 @@ zzip_mem_entry_find_extra_block(ZZIP_MEM_ENTRY * entry, short datatype, zzip_siz
char* ext_end = ext + entry->zz_extlen[i];
if (ext)
{
- while (ext + zzip_extra_block_headerlength <= ext_end)
+ /*
+ * Make sure that
+ * 1) the extra block header
+ * AND
+ * 2) the block we're looking for
+ * fit into the extra block!
+ */
+ while (ext + zzip_extra_block_headerlength + blocksize <= ext_end)
{
if (datatype == zzip_extra_block_get_datatype(ext))
{
@@ -337,6 +352,9 @@ zzip_mem_entry_find_extra_block(ZZIP_MEM_ENTRY * entry, short datatype, zzip_siz
}
}
+/** => zzip_mem_disk_unload
+ * This function ends usage of a file entry in a disk.
+ */
void
zzip_mem_entry_free(ZZIP_MEM_ENTRY * _zzip_restrict item)
{
@@ -353,6 +371,9 @@ zzip_mem_entry_free(ZZIP_MEM_ENTRY * _zzip_restrict item)
}
}
+/* => zzip_mem_disk_close
+ * This function will trigger an underlying disk_close
+ */
void
zzip_mem_disk_unload(ZZIP_MEM_DISK * dir)
{
@@ -368,6 +389,9 @@ zzip_mem_disk_unload(ZZIP_MEM_DISK * dir)
dir->disk = 0;
}
+/* end usage.
+ * This function closes the dir and disk handles.
+ */
void
zzip_mem_disk_close(ZZIP_MEM_DISK * _zzip_restrict dir)
{
@@ -431,6 +455,9 @@ foo(short zz_datatype)
}
#endif
+/** search entries.
+ * This function walks through the zip directory looking for a file.
+ */
ZZIP_MEM_ENTRY *
zzip_mem_disk_findfile(ZZIP_MEM_DISK * dir,
char *filename, ZZIP_MEM_ENTRY * after,
@@ -449,6 +476,9 @@ zzip_mem_disk_findfile(ZZIP_MEM_DISK * dir,
return 0;
}
+/* => zzip_mem_disk_findfile
+ * This function uses an fnmatch-like comparator to find files.
+ */
ZZIP_MEM_ENTRY *
zzip_mem_disk_findmatch(ZZIP_MEM_DISK * dir,
char *filespec, ZZIP_MEM_ENTRY * after,
@@ -467,6 +497,9 @@ zzip_mem_disk_findmatch(ZZIP_MEM_DISK * dir,
return 0;
}
+/** start usage.
+ * This function opens a referenced file entry from a openend disk.
+ */
zzip__new__ ZZIP_MEM_DISK_FILE *
zzip_mem_entry_fopen(ZZIP_MEM_DISK * dir, ZZIP_MEM_ENTRY * entry)
{
@@ -488,13 +521,25 @@ zzip_mem_entry_fopen(ZZIP_MEM_DISK * dir, ZZIP_MEM_ENTRY * entry)
file->zlib.avail_in = zzip_mem_entry_csize(entry);
file->zlib.next_in = zzip_mem_entry_to_data(entry);
+ debug2("compressed size %i", (int) file->zlib.avail_in);
+ if (file->zlib.next_in + file->zlib.avail_in >= file->endbuf)
+ goto error;
+ if (file->zlib.next_in < file->buffer)
+ goto error;
+
if (! zzip_mem_entry_data_deflated(entry) ||
inflateInit2(&file->zlib, -MAX_WBITS) != Z_OK)
{ free (file); return 0; }
return file;
+error:
+ errno = EBADMSG;
+ return NULL;
}
+/** => zzip_mem_entry_open
+ * This function opens a file by name from an openend disk.
+ */
zzip__new__ ZZIP_MEM_DISK_FILE *
zzip_mem_disk_fopen(ZZIP_MEM_DISK * dir, char *filename)
{
@@ -505,6 +550,9 @@ zzip_mem_disk_fopen(ZZIP_MEM_DISK * dir, char *filename)
return zzip_mem_entry_fopen(dir, entry);
}
+/** get data
+ * This function mimics the fread(2) behaviour.
+ */
_zzip_size_t
zzip_mem_disk_fread(void *ptr, _zzip_size_t size, _zzip_size_t nmemb,
ZZIP_MEM_DISK_FILE * file)
@@ -512,19 +560,27 @@ zzip_mem_disk_fread(void *ptr, _zzip_size_t size, _zzip_size_t nmemb,
return zzip_disk_fread(ptr, size, nmemb, file);
}
+/** close disk.
+ * This function mimics the fclose(2) behaviour.
+ */
int
zzip_mem_disk_fclose(ZZIP_MEM_DISK_FILE * file)
{
return zzip_disk_fclose(file);
}
+/** check disk.
+ * This function mimics the feof(2) behaviour.
+ */
int
zzip_mem_disk_feof(ZZIP_MEM_DISK_FILE * file)
{
return zzip_disk_feof(file);
}
-/* convert dostime of entry to unix time_t */
+/** helper.
+ * This function converts a zip dostime of an entry to unix time_t
+ */
long
zzip_disk_entry_get_mktime(ZZIP_DISK_ENTRY * entry)
{
diff --git a/Build/source/libs/zziplib/zziplib-src/zzip/mmapped.c b/Build/source/libs/zziplib/zziplib-src/zzip/mmapped.c
index c61fc5656b6..8af18f43070 100644
--- a/Build/source/libs/zziplib/zziplib-src/zzip/mmapped.c
+++ b/Build/source/libs/zziplib/zziplib-src/zzip/mmapped.c
@@ -414,16 +414,19 @@ zzip_disk_findfirst(ZZIP_DISK * disk)
for (; p >= disk->buffer; p--)
{
zzip_byte_t *root; /* (struct zzip_disk_entry*) */
+ zzip_size_t rootsize; /* Size of root central directory */
+
if (zzip_disk_trailer_check_magic(p))
{
struct zzip_disk_trailer *trailer = (struct zzip_disk_trailer *) p;
zzip_size_t rootseek = zzip_disk_trailer_get_rootseek(trailer);
+ rootsize = zzip_disk_trailer_get_rootsize(trailer);
+
root = disk->buffer + rootseek;
DBG2("disk rootseek at %lli", (long long)rootseek);
if (root > p)
{
/* the first disk_entry is after the disk_trailer? can't be! */
- zzip_size_t rootsize = zzip_disk_trailer_get_rootsize(trailer);
DBG2("have rootsize at %lli", (long long)rootsize);
if (disk->buffer + rootsize > p)
continue;
@@ -442,6 +445,7 @@ zzip_disk_findfirst(ZZIP_DISK * disk)
return 0;
}
zzip_size_t rootseek = zzip_disk64_trailer_get_rootseek(trailer);
+ rootsize = zzip_disk64_trailer_get_rootsize(trailer);
DBG2("disk64 rootseek at %lli", (long long)rootseek);
root = disk->buffer + rootseek;
if (root > p)
@@ -458,6 +462,12 @@ zzip_disk_findfirst(ZZIP_DISK * disk)
errno = EBADMSG;
return 0;
}
+ if (root >= disk->endbuf || (root + rootsize) >= disk->endbuf)
+ {
+ DBG1("root behind endbuf should be impossible");
+ errno = EBADMSG;
+ return 0;
+ }
if (zzip_disk_entry_check_magic(root))
{
DBG2("found the disk root %p", root);
@@ -644,6 +654,8 @@ zzip_disk_entry_fopen(ZZIP_DISK * disk, ZZIP_DISK_ENTRY * entry)
DBG2("compressed size %i", (int) file->zlib.avail_in);
if (file->zlib.next_in + file->zlib.avail_in >= disk->endbuf)
goto error;
+ if (file->zlib.next_in < disk->buffer)
+ goto error;
if (! zzip_file_header_data_deflated(header))
goto error;
diff --git a/Build/source/libs/zziplib/zziplib-src/zzip/mmapped.h b/Build/source/libs/zziplib/zziplib-src/zzip/mmapped.h
index 652ad293233..4418db47bd6 100644
--- a/Build/source/libs/zziplib/zziplib-src/zzip/mmapped.h
+++ b/Build/source/libs/zziplib/zziplib-src/zzip/mmapped.h
@@ -37,11 +37,7 @@ struct zzip_disk
void* reserved; /* - for later extensions (might be renamed) */
void* user; /* - free for applications (use this!) */
long flags; /* bit 0: findfile searches case-insensitive */
-#ifdef _WIN64
- __int64 mapped;
-#else
long mapped; /* used for mmap() wrappers of zzip/__mmap.h */
-#endif
long unused; /* - for later extensions (might be renamed) */
long code; /* - free for applications (use this!) */
};
diff --git a/Build/source/libs/zziplib/zziplib-src/zzip/plugin.c b/Build/source/libs/zziplib/zziplib-src/zzip/plugin.c
index 17285d8dbd0..3ce23a5e8b9 100644
--- a/Build/source/libs/zziplib/zziplib-src/zzip/plugin.c
+++ b/Build/source/libs/zziplib/zziplib-src/zzip/plugin.c
@@ -21,6 +21,9 @@
#include <zzip/file.h>
#include <zzip/format.h>
+/** get file size.
+ * This function works on a real file descriptor.
+ */
zzip_off_t
zzip_filesize(int fd)
{
@@ -59,7 +62,8 @@ zzip_get_default_io(void)
return (zzip_plugin_io_t) & default_io;
}
-/**
+/** init plugin struct.
+ *
* This function initializes the users handler struct to default values
* being the posix io functions in default configured environments.
*
diff --git a/Build/source/libs/zziplib/zziplib-src/zzip/plugin.h b/Build/source/libs/zziplib/zziplib-src/zzip/plugin.h
index db81ff4fafd..b4b39722e96 100644
--- a/Build/source/libs/zziplib/zziplib-src/zzip/plugin.h
+++ b/Build/source/libs/zziplib/zziplib-src/zzip/plugin.h
@@ -42,11 +42,7 @@ struct zzip_plugin_io { /* use "zzip_plugin_io_handlers" in applications !! */
zzip_ssize_t (*read)(int fd, void* buf, zzip_size_t len);
zzip_off_t (*seeks)(int fd, zzip_off_t offset, int whence);
zzip_off_t (*filesize)(int fd);
-#ifdef _WIN64
- __int64 sys;
-#else
long sys;
-#endif
long type;
zzip_ssize_t (*write)(int fd, _zzip_const void* buf, zzip_size_t len);
};
diff --git a/Build/source/libs/zziplib/zziplib-src/zzip/stat.c b/Build/source/libs/zziplib/zziplib-src/zzip/stat.c
index deec99671ac..0c53b4592bb 100644
--- a/Build/source/libs/zziplib/zziplib-src/zzip/stat.c
+++ b/Build/source/libs/zziplib/zziplib-src/zzip/stat.c
@@ -24,9 +24,9 @@
#define ZZIP_USE_INTERNAL
#include <zzip/info.h>
-/**
- * obtain information about a filename in an opened zip-archive without
- * opening that file first. Mostly used to obtain the uncompressed
+/** get meta infornation on a zipped element.
+ * This function obtains information about a filename in an opened zip-archive
+ * without opening that file first. Mostly used to obtain the uncompressed
* size of a file inside a zip-archive. see => zzip_dir_open.
*/
int
diff --git a/Build/source/libs/zziplib/zziplib-src/zzip/stdint.h b/Build/source/libs/zziplib/zziplib-src/zzip/stdint.h
index 4552c5b04e0..9526976356c 100644
--- a/Build/source/libs/zziplib/zziplib-src/zzip/stdint.h
+++ b/Build/source/libs/zziplib/zziplib-src/zzip/stdint.h
@@ -38,8 +38,19 @@
typedef unsigned long uint32_t; typedef signed long int32_t;
# endif
+/* either (long long) on Unix or (__int64) on Windows */
typedef unsigned _zzip___int64 uint64_t; typedef _zzip___int64 int64_t;
-#endif
+# if defined ZZIP_SIZEOF_INT_P
+# if ZZIP_SIZEOF_INT_P == ZZIP_SIZEOF_LONG+0
+ typedef long intptr_t;
+# elif ZZIP_SIZEOF_INT_P == ZZIP_SIZEOF_INT+0
+ typedef int intptr_t;
+# else
+ typedef int64_t intptr_t;
+# endif
+# endif
+
+#endif /* ZZIP_HAVE_... */
#endif /*_ZZIP_STDINT_H*/
diff --git a/Build/source/libs/zziplib/zziplib-src/zzip/zip.c b/Build/source/libs/zziplib/zziplib-src/zzip/zip.c
index d0b2d6e4196..14e2e06615c 100644
--- a/Build/source/libs/zziplib/zziplib-src/zzip/zip.c
+++ b/Build/source/libs/zziplib/zziplib-src/zzip/zip.c
@@ -1,4 +1,3 @@
-
/*
* Author:
* Guido Draheim <guidod@gmx.de>
@@ -91,7 +90,7 @@ _zzip_inline static char *__zzip_aligned4(char *p);
#ifdef ZZIP_HARDEN
-/*
+/* internal.
* check for inconsistent values in trailer and prefer lower seek value
* - we fix values assuming the root directory was written at the end
* and it is just before the zip trailer. Therefore, ...
@@ -168,7 +167,7 @@ __debug_dir_hdr(struct zzip_dir_hdr *hdr)
/* #define ZZIP_BUFSIZ 64 / * for testing */
#endif
-/**
+/** internal.
* This function is used by => zzip_file_open. It tries to find
* the zip's central directory info that is usually a few
* bytes off the end of the file.
@@ -318,6 +317,8 @@ __zzip_fetch_disk_trailer(int fd, zzip_off_t filesize,
trailer->zz_rootseek = zzip_disk_trailer_rootseek(orig);
trailer->zz_rootsize = zzip_disk_trailer_rootsize(orig);
# endif
+ if (trailer->zz_rootseek < 0 || trailer->zz_rootsize < 0)
+ return(ZZIP_CORRUPTED); // forged value
__fixup_rootseek(offset + tail - mapped, trailer);
/*
@@ -344,6 +345,8 @@ __zzip_fetch_disk_trailer(int fd, zzip_off_t filesize,
zzip_disk64_trailer_finalentries(orig);
trailer->zz_rootseek = zzip_disk64_trailer_rootseek(orig);
trailer->zz_rootsize = zzip_disk64_trailer_rootsize(orig);
+ if (trailer->zz_rootseek < 0 || trailer->zz_rootsize < 0)
+ return(ZZIP_CORRUPTED); // forged value
/*
* "extract data from files archived in a single zip file."
* So the file offsets must be within the current ZIP archive!
@@ -381,23 +384,19 @@ __zzip_fetch_disk_trailer(int fd, zzip_off_t filesize,
* making pointer alignments to values that can be handled as structures
* is tricky. We assume here that an align(4) is sufficient even for
* 64 bit machines. Note that binary operations are not usually allowed
- * to pointer types but we can cast the value to a suitably sized integer.
+ * to pointer types but we do need only the lower bits in this implementation,
+ * so we can just cast the value to a long value.
*/
_zzip_inline static char *
__zzip_aligned4(char *p)
{
#define aligned4 __zzip_aligned4
-#ifdef _WIN64
- p += ((__int64) p) & 1;
- p += ((__int64) p) & 2;
-#else
- p += ((long) p) & 1;
- p += ((long) p) & 2;
-#endif
+ p += ((intptr_t) p) & 1;
+ p += ((intptr_t) p) & 2;
return p;
}
-/**
+/** internal.
* This function is used by => zzip_file_open, it is usually called after
* => __zzip_find_disk_trailer. It will parse the zip's central directory
* information and create a zziplib private directory table in
@@ -422,6 +421,9 @@ __zzip_parse_root_directory(int fd,
zzip_off64_t zz_rootseek = _disk_trailer_rootseek(trailer);
__correct_rootseek(zz_rootseek, zz_rootsize, trailer);
+ if (zz_entries < 0 || zz_rootseek < 0 || zz_rootsize < 0)
+ return ZZIP_CORRUPTED;
+
hdr0 = (struct zzip_dir_hdr *) malloc(zz_rootsize);
if (! hdr0)
return ZZIP_DIRSIZE;
@@ -465,8 +467,9 @@ __zzip_parse_root_directory(int fd,
# endif
if (fd_map)
- { d = (void*)(fd_map+zz_fd_gap+zz_offset); } /* fd_map+fd_gap==u_rootseek */
- else
+ {
+ d = (void*)(fd_map+zz_fd_gap+zz_offset); /* fd_map+fd_gap==u_rootseek */
+ } else
{
if (io->fd.seeks(fd, zz_rootseek + zz_offset, SEEK_SET) < 0)
return ZZIP_DIR_SEEK;
@@ -602,8 +605,8 @@ zzip_get_default_ext(void)
return ext;
}
-/**
- * allocate a new ZZIP_DIR handle and do basic
+/** start usage. also: zzip_dir_free
+ * This function allocates a new ZZIP_DIR handle and do basic
* initializations before usage by => zzip_dir_fdopen
* => zzip_dir_open => zzip_file_open or through
* => zzip_open
@@ -624,7 +627,7 @@ zzip_dir_alloc_ext_io(zzip_strings_t * ext, const zzip_plugin_io_t io)
}
/** => zzip_dir_alloc_ext_io
- * this function is obsolete - it was generally used for implementation
+ * This function is obsolete - it was generally used for implementation
* and exported to let other code build on it. It is now advised to
* use => zzip_dir_alloc_ext_io now on explicitly, just set that second
* argument to zero to achieve the same functionality as the old style.
@@ -635,8 +638,8 @@ zzip_dir_alloc(zzip_strings_t * fileext)
return zzip_dir_alloc_ext_io(fileext, 0);
}
-/**
- * will free the zzip_dir handle unless there are still
+/** => zzip_dir_alloc_ext_io
+ * This function will free the zzip_dir handle unless there are still
* zzip_files attached (that may use its cache buffer).
* This is the inverse of => zzip_dir_alloc , and both
* are helper functions used implicitly in other zzipcalls
@@ -677,9 +680,9 @@ zzip_dir_close(ZZIP_DIR * dir)
return zzip_dir_free(dir);
}
-/**
- * used by the => zzip_dir_open and zzip_opendir(2) call. Opens the
- * zip-archive as specified with the fd which points to an
+/** fd reopen.
+ * This function is used by the => zzip_dir_open and zzip_opendir(2) call.
+ * Opens the zip-archive as specified with the fd which points to an
* already openend file. This function then search and parse
* the zip's central directory.
*
@@ -758,7 +761,7 @@ __zzip_dir_parse(ZZIP_DIR * dir)
return rv;
}
-/**
+/** internal.
* This function will attach any of the .zip extensions then
* trying to open it the with => open(2). This is a helper
* function for => zzip_dir_open, => zzip_opendir and => zzip_open.
@@ -794,9 +797,9 @@ __zzip_try_open(zzip_char_t * filename, int filemode,
return -1;
}
-/**
- * Opens the zip-archive (if available).
- * the two ext_io arguments will default to use posix io and
+/** open zip-archive.
+ * This function opens the given zip-archive (if available).
+ * The two ext_io arguments will default to use posix io and
* a set of default fileext that can atleast add .zip ext itself.
*/
ZZIP_DIR *
diff --git a/Build/source/libs/zziplib/zziplib-src/zzip/zzip-zlib-config.pc b/Build/source/libs/zziplib/zziplib-src/zzip/zzip-zlib-config.pc
deleted file mode 100644
index 39097d41dfa..00000000000
--- a/Build/source/libs/zziplib/zziplib-src/zzip/zzip-zlib-config.pc
+++ /dev/null
@@ -1,8 +0,0 @@
-zlib_libs= -lz
-zlib_cflags=
-
-Name: zzip-zlib-config
-Version: 1.2.8
-Description: ZLib Config (for ZZipLib)
-Libs: ${zlib_libs}
-Cflags: ${zlib_cflags}
diff --git a/Build/source/libs/zziplib/zziplib-src/zzip/zzipfseeko.pc b/Build/source/libs/zziplib/zziplib-src/zzip/zzipfseeko.pc
deleted file mode 100644
index 336240cc427..00000000000
--- a/Build/source/libs/zziplib/zziplib-src/zzip/zzipfseeko.pc
+++ /dev/null
@@ -1,18 +0,0 @@
-# generated by configure / remove this line to disable regeneration
-prefix=/usr/local
-exec_prefix=${prefix}
-bindir=${exec_prefix}/bin
-libdir=${exec_prefix}/lib64
-datarootdir=${prefix}/share
-datadir=${datarootdir}
-sysconfdir=${prefix}/etc
-includedir=${prefix}/include
-package=zzipfseeko
-suffix=
-
-Name: zzipfseeko
-Description: ZZipLib - libZ-based ZIP-access Library with an Easy-to-Use API
-Version: 0.13.68
-Requires: zzip-zlib-config
-Libs: -L${libdir} -lzzipfseeko
-Cflags: -I${includedir}
diff --git a/Build/source/libs/zziplib/zziplib-src/zzip/zziplib.pc b/Build/source/libs/zziplib/zziplib-src/zzip/zziplib.pc
deleted file mode 100644
index 21eb50234af..00000000000
--- a/Build/source/libs/zziplib/zziplib-src/zzip/zziplib.pc
+++ /dev/null
@@ -1,18 +0,0 @@
-# generated by configure / remove this line to disable regeneration
-prefix=/usr/local
-exec_prefix=${prefix}
-bindir=${exec_prefix}/bin
-libdir=${exec_prefix}/lib64
-datarootdir=${prefix}/share
-datadir=${datarootdir}
-sysconfdir=${prefix}/etc
-includedir=${prefix}/include
-package=zziplib
-suffix=
-
-Name: zziplib
-Description: ZZipLib - libZ-based ZIP-access Library with an Easy-to-Use API
-Version: 0.13.68
-Requires: zzip-zlib-config
-Libs: -L${libdir} -lzzip
-Cflags: -I${includedir}
diff --git a/Build/source/libs/zziplib/zziplib-src/zzip/zzipmmapped.pc b/Build/source/libs/zziplib/zziplib-src/zzip/zzipmmapped.pc
deleted file mode 100644
index e4e99a086be..00000000000
--- a/Build/source/libs/zziplib/zziplib-src/zzip/zzipmmapped.pc
+++ /dev/null
@@ -1,18 +0,0 @@
-# generated by configure / remove this line to disable regeneration
-prefix=/usr/local
-exec_prefix=${prefix}
-bindir=${exec_prefix}/bin
-libdir=${exec_prefix}/lib64
-datarootdir=${prefix}/share
-datadir=${datarootdir}
-sysconfdir=${prefix}/etc
-includedir=${prefix}/include
-package=zzipmmapped
-suffix=
-
-Name: zzipmmapped
-Description: ZZipLib - libZ-based ZIP-access Library with an Easy-to-Use API
-Version: 0.13.68
-Requires: zzip-zlib-config
-Libs: -L${libdir} -lzzipmmapped
-Cflags: -I${includedir}