fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
0caff16650eedfee8a48494efb213e79a51f5ff4
harbour-core/contrib/hbmzip/3rd/minizip/minizip.diff
Viktor Szakats 0caff16650 2017-09-13 12:38 UTC Viktor Szakats (vszakats users.noreply.github.com) 
- doc/en/hashes.txt
  - doc/en/rdddb.txt
  * .gitattributes
  * contrib/3rd/sqlite3/sqlite3.hbp
  * contrib/hbbz2/3rd/bz2/bz2.hbp
  * contrib/hbexpat/3rd/expat/expat.hbp
  * contrib/hbfimage/hbfimage.hbp
  * contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp
  * contrib/hblzf/3rd/liblzf/lzf.hbp
  * contrib/hbmxml/3rd/minixml/mxml.hbp
  * contrib/hbmzip/3rd/minizip/minizip.hbp
  * contrib/hbodbc/hbodbc.hbp
  * contrib/hbtinymt/3rd/tinymt/tinymt.hbp
  * contrib/hbxdiff/3rd/libxdiff/xdiff.hbp
  * contrib/sddsqlt3/tests/test.prg
  * ChangeLog.txt
  * doc/Makefile
  * doc/oldnews.txt
  * extras/ps32/readme.txt
  * extras/superlib/readme.txt
  * src/3rd/jpeg/Makefile
  * src/3rd/pcre/Makefile
  * src/3rd/png/Makefile
  * src/3rd/tiff/Makefile
  * src/3rd/zlib/Makefile
  + contrib/hbsms/DEPRECATED.txt
  + contrib/hbtpathy/DEPRECATED.txt
  + contrib/xhb/WARNING.txt
  * contrib/3rd/sqlite3/sqlite3.dif -> contrib/3rd/sqlite3/sqlite3.diff
  * contrib/hbbz2/3rd/bz2/bz2.dif -> contrib/hbbz2/3rd/bz2/bz2.diff
  * contrib/hbexpat/3rd/expat/expat.dif -> contrib/hbexpat/3rd/expat/expat.diff
  * contrib/hbhpdf/3rd/libhpdf/libhpdf.dif -> contrib/hbhpdf/3rd/libhpdf/libhpdf.diff
  * contrib/hblzf/3rd/liblzf/liblzf.dif -> contrib/hblzf/3rd/liblzf/liblzf.diff
  * contrib/hbmxml/3rd/minixml/minixml.dif -> contrib/hbmxml/3rd/minixml/minixml.diff
  * contrib/hbmzip/3rd/minizip/minizip.dif -> contrib/hbmzip/3rd/minizip/minizip.diff
  * contrib/hbtinymt/3rd/tinymt/tinymt.dif -> contrib/hbtinymt/3rd/tinymt/tinymt.diff
  * contrib/hbxdiff/3rd/libxdiff/libxdiff.dif -> contrib/hbxdiff/3rd/libxdiff/xdiff.diff
  * contrib/sddsqlt3/tests/test.sq3 -> contrib/sddsqlt3/tests/test.sqlite3
  * extras/dbu/dbu52.dif -> extras/dbu/dbu52.patch
  * extras/dbu/dbu53.dif -> extras/dbu/dbu53.patch
  * extras/ps32/ps32.dif -> extras/ps32/ps32.patch
  * extras/rl/rl.dif -> extras/rl/rl.patch
  * extras/superlib/superlib.dif -> extras/superlib/superlib.patch
  * extras/template/readme.txt -> extras/template/README.md
  * src/3rd/hbdossrl/README -> src/3rd/hbdossrl/README.txt
  * src/3rd/jpeg/jpeg.dif -> src/3rd/jpeg/jpeg.diff
  * src/3rd/pcre/pcre.dif -> src/3rd/pcre/pcre.diff
  * src/3rd/png/png.dif -> src/3rd/png/png.diff
  * src/3rd/tiff/tiff.dif -> src/3rd/tiff/tiff.diff
  * src/3rd/zlib/zlib.dif -> src/3rd/zlib/zlib.diff
  * tests/hbpptest/_pp_test.prg -> tests/hbpp/_pp_test.prg
  * tests/hbpptest/compare.hb -> tests/hbpp/compare.hb
  * tests/hbpptest/hbpptest.hbp -> tests/hbpp/hbpptest.hbp
  * tests/hbpptest/hbpptest.prg -> tests/hbpp/hbpptest.prg
  * tests/tflock.prg -> tests/flock.prg
  * contrib/hbfimage/fi_wrp.c -> contrib/hbfimage/core.c
  * contrib/hbodbc/browodbc.prg -> contrib/hbodbc/browse.prg
  * doc/cmdline.txt -> doc/cmdline.md
  * extras/dbu/readme.txt -> extras/dbu/README.md
  * extras/rl/readme.txt -> extras/rl/README.md
    * some file renames synced with 3.4 fork, plus the content of
      some of them. Some new text files added as well.
      Note, 3rd party code rediffing won't work anymore on 8.3
      filesystems.
2017-09-13 12:39:48 +00:00

516 lines
15 KiB
Diff
Raw Blame History

diff -urN minizip.orig/crypt.h minizip/crypt.h
--- minizip.orig/crypt.h 2014-02-03 23:03:08.376029998 +0100
+++ minizip/crypt.h 2014-02-03 23:03:08.376029998 +0100
@@ -38,6 +38,8 @@
* unpredictable manner on 16-bit systems; not a problem
* with any known compiler so far, though */
+ (void) pcrc_32_tab;
+
temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;
return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);
}
diff -urN minizip.orig/ioapi.c minizip/ioapi.c
--- minizip.orig/ioapi.c 2014-02-03 23:03:08.380029998 +0100
+++ minizip/ioapi.c 2014-02-03 23:03:08.380029998 +0100
@@ -27,6 +27,7 @@
#include "ioapi.h"
+#include "hbapifs.h"
voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode)
{
@@ -96,6 +97,9 @@
{
FILE* file = NULL;
const char* mode_fopen = NULL;
+
+ (void) opaque;
+
if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
mode_fopen = "rb";
else
@@ -114,6 +118,9 @@
{
FILE* file = NULL;
const char* mode_fopen = NULL;
+
+ (void) opaque;
+
if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
mode_fopen = "rb";
else
@@ -132,6 +139,9 @@
static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size)
{
uLong ret;
+
+ (void) opaque;
+
ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
return ret;
}
@@ -139,6 +149,9 @@
static uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size)
{
uLong ret;
+
+ (void) opaque;
+
ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
return ret;
}
@@ -146,6 +159,9 @@
static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)
{
long ret;
+
+ (void) opaque;
+
ret = ftell((FILE *)stream);
return ret;
}
@@ -154,14 +170,20 @@
static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream)
{
ZPOS64_T ret;
+
+ (void) opaque;
+
ret = FTELLO_FUNC((FILE *)stream);
return ret;
}
static long ZCALLBACK fseek_file_func (voidpf opaque, voidpf stream, uLong offset, int origin)
{
- int fseek_origin=0;
+ int fseek_origin;
long ret;
+
+ (void) opaque;
+
switch (origin)
{
case ZLIB_FILEFUNC_SEEK_CUR :
@@ -183,8 +205,11 @@
static long ZCALLBACK fseek64_file_func (voidpf opaque, voidpf stream, ZPOS64_T offset, int origin)
{
- int fseek_origin=0;
+ int fseek_origin;
long ret;
+
+ (void) opaque;
+
switch (origin)
{
case ZLIB_FILEFUNC_SEEK_CUR :
@@ -210,6 +235,9 @@
static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
{
int ret;
+
+ (void) opaque;
+
ret = fclose((FILE *)stream);
return ret;
}
@@ -217,12 +245,14 @@
static int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream)
{
int ret;
+
+ (void) opaque;
+
ret = ferror((FILE *)stream);
return ret;
}
-void fill_fopen_filefunc (pzlib_filefunc_def)
- zlib_filefunc_def* pzlib_filefunc_def;
+void fill_fopen_filefunc (zlib_filefunc_def* pzlib_filefunc_def)
{
pzlib_filefunc_def->zopen_file = fopen_file_func;
pzlib_filefunc_def->zread_file = fread_file_func;
diff -urN minizip.orig/ioapi.h minizip/ioapi.h
--- minizip.orig/ioapi.h 2014-02-03 23:03:08.380029998 +0100
+++ minizip/ioapi.h 2014-02-03 23:03:08.380029998 +0100
@@ -21,30 +21,58 @@
#ifndef _ZLIBIOAPI64_H
#define _ZLIBIOAPI64_H
-#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
-
- // Linux needs this to support file operation on files larger then 4+GB
- // But might need better if/def to select just the platforms that needs them.
-
- #ifndef __USE_FILE_OFFSET64
- #define __USE_FILE_OFFSET64
- #endif
- #ifndef __USE_LARGEFILE64
- #define __USE_LARGEFILE64
- #endif
- #ifndef _LARGEFILE64_SOURCE
- #define _LARGEFILE64_SOURCE
- #endif
- #ifndef _FILE_OFFSET_BIT
- #define _FILE_OFFSET_BIT 64
- #endif
-
+#if !(defined(_WIN32) || defined(WIN32)) && \
+ !(defined(__MSDOS__) || defined(MSDOS)) && \
+ !(defined(OS_2) || defined(__OS2__) || defined(OS2)) && \
+ !defined(__WATCOMC__)
+
+ /* Linux needs this to support file operation on files larger then 4+GB
+ * on 32bit platforms
+ * But might need better if/def to select just the platforms that needs them.
+ */
+ #ifndef _LARGEFILE_SOURCE
+ #define _LARGEFILE_SOURCE
+ #endif
+ #ifndef _LARGEFILE64_SOURCE
+ #define _LARGEFILE64_SOURCE
+ #endif
+ #ifndef _FILE_OFFSET_BITS
+ #define _FILE_OFFSET_BITS 64
+ #endif
#endif
#include <stdio.h>
#include <stdlib.h>
#include "zlib.h"
+#include "hbsetup.h"
+
+#if defined( HB_OS_VXWORKS ) && defined( _STD_USING_INT_TYPES )
+ /* NOTE: Hack to avoid collision between stdint.h and types/vxTypes.h. [vszakats] */
+ #ifndef __BIT_TYPES_DEFINED__
+ #define __BIT_TYPES_DEFINED__
+ #endif
+ #ifndef _SYS_INT_TYPES_H
+ #define _SYS_INT_TYPES_H
+ #endif
+#endif
+
+#if defined( __BORLANDC__ ) || \
+ defined( __WATCOMC__ ) || \
+ defined( __MINGW32CE__ ) || \
+ defined( __DMC__ ) || \
+ defined( HB_OS_VXWORKS ) || \
+ defined( HB_OS_BSD ) || \
+ defined( HB_OS_DARWIN ) || \
+ defined( HB_OS_BEOS ) || \
+ defined( HB_OS_DOS ) || \
+ defined( HB_OS_OS2 ) || \
+ defined( HB_OS_CYGWIN ) || \
+ defined( HB_OS_MINIX ) || \
+ defined( HB_OS_ANDROID )
+# define USE_FILE32API
+#endif
+
#if defined(USE_FILE32API)
#define fopen64 fopen
#define ftello64 ftell
@@ -186,8 +214,8 @@
#define ZREAD64(filefunc,filestream,buf,size) ((*((filefunc).zfile_func64.zread_file)) ((filefunc).zfile_func64.opaque,filestream,buf,size))
#define ZWRITE64(filefunc,filestream,buf,size) ((*((filefunc).zfile_func64.zwrite_file)) ((filefunc).zfile_func64.opaque,filestream,buf,size))
-//#define ZTELL64(filefunc,filestream) ((*((filefunc).ztell64_file)) ((filefunc).opaque,filestream))
-//#define ZSEEK64(filefunc,filestream,pos,mode) ((*((filefunc).zseek64_file)) ((filefunc).opaque,filestream,pos,mode))
+/*#define ZTELL64(filefunc,filestream) ((*((filefunc).ztell64_file)) ((filefunc).opaque,filestream))*/
+/*#define ZSEEK64(filefunc,filestream,pos,mode) ((*((filefunc).zseek64_file)) ((filefunc).opaque,filestream,pos,mode))*/
#define ZCLOSE64(filefunc,filestream) ((*((filefunc).zfile_func64.zclose_file)) ((filefunc).zfile_func64.opaque,filestream))
#define ZERROR64(filefunc,filestream) ((*((filefunc).zfile_func64.zerror_file)) ((filefunc).zfile_func64.opaque,filestream))
diff -urN minizip.orig/unzip.c minizip/unzip.c
--- minizip.orig/unzip.c 2014-02-03 23:03:08.380029998 +0100
+++ minizip/unzip.c 2014-02-03 23:03:08.380029998 +0100
@@ -68,13 +68,21 @@
#include <stdlib.h>
#include <string.h>
+/*
#ifndef NOUNCRYPT
#define NOUNCRYPT
#endif
+*/
#include "zlib.h"
#include "unzip.h"
+#if ZLIB_VERNUM < 0x1270
+# define z_crc_t unsigned long
+#endif
+
+#include "hbapi.h" /* for hb_xgrab()/hb_xfree() */
+
#ifdef STDC
# include <stddef.h>
# include <string.h>
@@ -109,10 +117,10 @@
#endif
#ifndef ALLOC
-# define ALLOC(size) (malloc(size))
+# define ALLOC(size) hb_xgrab(size)
#endif
#ifndef TRYFREE
-# define TRYFREE(p) {if (p) free(p);}
+# define TRYFREE(p) do {if (p) hb_xfree(p);} while( 0 )
#endif
#define SIZECENTRALDIRITEM (0x2e)
@@ -1090,19 +1098,14 @@
if (lSeek!=0)
{
- if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
- lSeek=0;
- else
+ if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)!=0)
err=UNZ_ERRNO;
}
if ((file_info.size_file_comment>0) && (commentBufferSize>0))
if (ZREAD64(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)
err=UNZ_ERRNO;
- lSeek+=file_info.size_file_comment - uSizeRead;
}
- else
- lSeek+=file_info.size_file_comment;
if ((err==UNZ_OK) && (pfile_info!=NULL))
@@ -1177,7 +1180,7 @@
*/
extern int ZEXPORT unzGoToFirstFile (unzFile file)
{
- int err=UNZ_OK;
+ int err;
unz64_s* s;
if (file==NULL)
return UNZ_PARAMERROR;
@@ -1472,7 +1475,7 @@
extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method,
int* level, int raw, const char* password)
{
- int err=UNZ_OK;
+ int err;
uInt iSizeVar;
unz64_s* s;
file_in_zip64_read_info_s* pfile_in_zip_read_info;
@@ -1529,6 +1532,7 @@
}
}
+#if 0
if ((s->cur_file_info.compression_method!=0) &&
/* #ifdef HAVE_BZIP2 */
(s->cur_file_info.compression_method!=Z_BZIP2ED) &&
@@ -1536,6 +1540,7 @@
(s->cur_file_info.compression_method!=Z_DEFLATED))
err=UNZ_BADZIPFILE;
+#endif
pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;
pfile_in_zip_read_info->crc32=0;
diff -urN minizip.orig/zip.c minizip/zip.c
--- minizip.orig/zip.c 2014-02-03 23:03:08.384029999 +0100
+++ minizip/zip.c 2014-02-03 23:03:08.384029999 +0100
@@ -29,16 +29,24 @@
#include "zlib.h"
#include "zip.h"
+#if ZLIB_VERNUM < 0x1270
+# define z_crc_t unsigned long
+#endif
+
+#include "hbapi.h" /* for hb_xgrab()/hb_xfree() */
+
#ifdef STDC
# include <stddef.h>
# include <string.h>
# include <stdlib.h>
#endif
+/*
#ifdef NO_ERRNO_H
extern int errno;
#else
# include <errno.h>
#endif
+*/
#ifndef local
@@ -59,10 +67,10 @@
#endif
#ifndef ALLOC
-# define ALLOC(size) (malloc(size))
+# define ALLOC(size) hb_xgrab(size)
#endif
#ifndef TRYFREE
-# define TRYFREE(p) {if (p) free(p);}
+# define TRYFREE(p) do {if (p) hb_xfree(p);} while( 0 )
#endif
/*
@@ -186,6 +194,12 @@
#include "crypt.h"
#endif
+/* Forward definitions */
+local linkedlist_datablock_internal* allocate_new_datablock( void );
+local void free_datablock( linkedlist_datablock_internal* ldi );
+local void init_linkedlist( linkedlist_data* ll );
+local int add_data_in_datablock( linkedlist_data* ll, const void* buf, uLong len );
+
local linkedlist_datablock_internal* allocate_new_datablock()
{
linkedlist_datablock_internal* ldi;
@@ -1034,10 +1048,10 @@
// Remember position of Zip64 extended info for the local file header. (needed when we update size after done with file)
zi->ci.pos_zip64extrainfo = ZTELL64(zi->z_filefunc,zi->filestream);
- err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)HeaderID,2);
- err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)DataSize,2);
+ zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)HeaderID,2);
+ zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)DataSize,2);
- err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)UncompressedSize,8);
+ zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)UncompressedSize,8);
err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)CompressedSize,8);
}
@@ -1064,7 +1078,7 @@
uInt size_filename;
uInt size_comment;
uInt i;
- int err = ZIP_OK;
+ int err;
# ifdef NOCRYPT
(crcForCrypting);
@@ -1370,7 +1384,7 @@
uInt i;
int t;
for (i=0;i<zi->ci.pos_in_buffered_data;i++)
- zi->ci.buffered_data[i] = zencode(zi->ci.keys, zi->ci.pcrc_32_tab, zi->ci.buffered_data[i],t);
+ zi->ci.buffered_data[i] = (Byte) zencode(zi->ci.keys, zi->ci.pcrc_32_tab, zi->ci.buffered_data[i],t);
#endif
}
@@ -1471,12 +1485,13 @@
{
uLong uTotalOutBefore = zi->ci.stream.total_out;
err=deflate(&zi->ci.stream, Z_NO_FLUSH);
+/*
if(uTotalOutBefore > zi->ci.stream.total_out)
{
int bBreak = 0;
bBreak++;
}
-
+*/
zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
}
else
@@ -1534,8 +1549,7 @@
uLong uTotalOutBefore;
if (zi->ci.stream.avail_out == 0)
{
- if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
- err = ZIP_ERRNO;
+ zip64FlushWriteBuffer(zi);
zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
zi->ci.stream.next_out = zi->ci.buffered_data;
}
@@ -1649,7 +1663,7 @@
if(datasize > 0)
{
- char* p = NULL;
+ char* p;
if((uLong)(datasize + 4) > zi->ci.size_centralExtraFree)
{
@@ -1680,7 +1694,9 @@
if(zi->ci.pos_local_header >= 0xffffffff)
{
zip64local_putValue_inmemory(p, zi->ci.pos_local_header, 8);
+/*
p += 8;
+*/
}
// Update how much extra free space we got in the memory buffer
@@ -1697,7 +1713,7 @@
if (err==ZIP_OK)
err = add_data_in_datablock(&zi->central_dir, zi->ci.central_header, (uLong)zi->ci.size_centralheader);
- free(zi->ci.central_header);
+ TRYFREE(zi->ci.central_header);
if (err==ZIP_OK)
{
@@ -1754,7 +1770,7 @@
int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
{
- int err = ZIP_OK;
+ int err;
ZPOS64_T pos = zip64eocd_pos_inzip - zi->add_position_when_writting_offset;
err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDLOCHEADERMAGIC,4);
@@ -1776,7 +1792,7 @@
int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
{
- int err = ZIP_OK;
+ int err;
uLong Zip64DataSize = 44;
@@ -1815,7 +1831,7 @@
}
int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
{
- int err = ZIP_OK;
+ int err;
/*signature*/
err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ENDHEADERMAGIC,4);
@@ -1863,7 +1879,7 @@
int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
{
- int err = ZIP_OK;
+ int err;
uInt size_global_comment = 0;
if(global_comment != NULL)
@@ -1957,7 +1973,7 @@
short header;
short dataSize;
- int retVal = ZIP_OK;
+ int retVal;
if(pData == NULL || *dataLen < 4)
return ZIP_PARAMERROR;
diff -urN minizip.orig/zip.h minizip/zip.h
--- minizip.orig/zip.h 2014-02-03 23:03:08.384029999 +0100
+++ minizip/zip.h 2014-02-03 23:03:08.384029999 +0100
@@ -44,7 +44,7 @@
extern "C" {
#endif
-//#define HAVE_BZIP2
+/*#define HAVE_BZIP2*/
#ifndef _ZLIB_H
#include "zlib.h"
Reference in New Issue View Git Blame Copy Permalink