5a2a287752
* *
* partial sync with the 3.4 fork codebase. These are the things
synces for the most part:
- copyright headers
- grammar/typos in comments and some readmes
- comment/whitespace/decorations
- variable scoping in C files
- DO CASE/SWITCH and some other alternate syntax usage
- minimal amount of human readable text in strings
- minor code updates
- HB_TRACE() void * casts for pointers and few other changes to
avoid C compiler warnings
- various other, minor code cleanups
- only Harbour/C code/headers were touched in src, utils, contrib,
include. No 3rd party code, no make files, and with just a few
exceptions, no 'tests' code was touched.
- certain components were not touched were 3.4 diverged too much
already, like f.e. hbmk2, hbssl, hbcurl, hbexpat
- the goal was that no actual program logic should be altered by
these changes. Except some possible minor exceptions, any such
change is probably a bug in this patch.
It's a massive patch, if you find anything broken after it, please
open an Issue with the details. Build test was done on macOS.
The goal is make it easier to see what actual code/logic was changed
in 3.4 compared to 3.2 and to make patches easier to apply in both
ways.
375 lines
10 KiB
C
375 lines
10 KiB
C
/*
|
|
* BZIP2 functions wrapper
|
|
*
|
|
* Copyright 2010 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
* any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; see the file LICENSE.txt. If not, write to
|
|
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
* Boston, MA 02110-1301 USA (or visit https://www.gnu.org/licenses/).
|
|
*
|
|
* As a special exception, the Harbour Project gives permission for
|
|
* additional uses of the text contained in its release of Harbour.
|
|
*
|
|
* The exception is that, if you link the Harbour libraries with other
|
|
* files to produce an executable, this does not by itself cause the
|
|
* resulting executable to be covered by the GNU General Public License.
|
|
* Your use of that executable is in no way restricted on account of
|
|
* linking the Harbour library code into it.
|
|
*
|
|
* This exception does not however invalidate any other reasons why
|
|
* the executable file might be covered by the GNU General Public License.
|
|
*
|
|
* This exception applies only to the code released by the Harbour
|
|
* Project under the name Harbour. If you copy code from other
|
|
* Harbour Project or Free Software Foundation releases into a copy of
|
|
* Harbour, as the General Public License permits, the exception does
|
|
* not apply to the code that you add in this way. To avoid misleading
|
|
* anyone as to the status of such modified files, you must delete
|
|
* this exception notice from them.
|
|
*
|
|
* If you write modifications of your own for Harbour, it is your choice
|
|
* whether to permit this exception to apply to your modifications.
|
|
* If you do not wish that, delete this exception notice.
|
|
*
|
|
*/
|
|
|
|
#include "hbapi.h"
|
|
#include "hbapiitm.h"
|
|
#include "hbapierr.h"
|
|
|
|
#include <bzlib.h>
|
|
|
|
#include "hbbz2.ch"
|
|
|
|
static void * hb_bz2Alloc( void * cargo, int nmemb, int size )
|
|
{
|
|
HB_SYMBOL_UNUSED( cargo );
|
|
|
|
return ( nmemb > 0 && size > 0 ) ? hb_xalloc( ( HB_SIZE ) nmemb * size ) : NULL;
|
|
}
|
|
|
|
static void hb_bz2Free( void * cargo, void * ptr )
|
|
{
|
|
HB_SYMBOL_UNUSED( cargo );
|
|
|
|
if( ptr )
|
|
hb_xfree( ptr );
|
|
}
|
|
|
|
static HB_SIZE hb_bz2CompressBound( HB_SIZE nLen )
|
|
{
|
|
HB_SIZE nSize = nLen + nLen / 100 + 600;
|
|
|
|
return nSize < nLen ? HB_SIZE_MAX - 1 : nSize;
|
|
}
|
|
|
|
static int hb_bz2Compress( const char * szSrc, HB_SIZE nSrc,
|
|
char * szDst, HB_SIZE * pnDst, int iBlockSize )
|
|
{
|
|
bz_stream stream;
|
|
int iResult;
|
|
|
|
memset( &stream, 0, sizeof( stream ) );
|
|
|
|
stream.next_in = ( char * ) HB_UNCONST( szSrc );
|
|
stream.avail_in = ( unsigned int ) nSrc;
|
|
|
|
stream.next_out = szDst;
|
|
stream.avail_out = ( unsigned int ) *pnDst;
|
|
|
|
stream.bzalloc = hb_bz2Alloc;
|
|
stream.bzfree = hb_bz2Free;
|
|
#if 0
|
|
stream.opaque = NULL;
|
|
#endif
|
|
|
|
iResult = BZ2_bzCompressInit( &stream, iBlockSize, 0, 0 );
|
|
if( iResult == BZ_OK )
|
|
{
|
|
do
|
|
{
|
|
iResult = BZ2_bzCompress( &stream, BZ_FINISH );
|
|
}
|
|
while( iResult == BZ_FINISH_OK );
|
|
|
|
if( iResult == BZ_STREAM_END )
|
|
{
|
|
#if HB_SIZE_MAX <= UINT_MAX
|
|
*pnDst = ( HB_SIZE ) stream.total_out_lo32;
|
|
#else
|
|
*pnDst = ( ( HB_SIZE ) stream.total_out_hi32 << 32 ) |
|
|
stream.total_out_lo32;
|
|
#endif
|
|
iResult = BZ_OK;
|
|
}
|
|
|
|
BZ2_bzCompressEnd( &stream );
|
|
}
|
|
|
|
return iResult;
|
|
}
|
|
|
|
static HB_SIZE hb_bz2UncompressedSize( const char * szSrc, HB_SIZE nLen,
|
|
int * piResult )
|
|
{
|
|
char buffer[ 1024 ];
|
|
bz_stream stream;
|
|
HB_SIZE nDest = 0;
|
|
|
|
memset( &stream, 0, sizeof( stream ) );
|
|
|
|
stream.next_in = ( char * ) HB_UNCONST( szSrc );
|
|
stream.avail_in = ( unsigned int ) nLen;
|
|
|
|
stream.bzalloc = hb_bz2Alloc;
|
|
stream.bzfree = hb_bz2Free;
|
|
#if 0
|
|
stream.opaque = NULL;
|
|
#endif
|
|
|
|
*piResult = BZ2_bzDecompressInit( &stream, 0, 0 );
|
|
if( *piResult == BZ_OK )
|
|
{
|
|
do
|
|
{
|
|
stream.next_out = buffer;
|
|
stream.avail_out = sizeof( buffer );
|
|
*piResult = BZ2_bzDecompress( &stream );
|
|
}
|
|
while( *piResult == BZ_OK );
|
|
|
|
if( *piResult == BZ_STREAM_END )
|
|
{
|
|
*piResult = BZ_OK;
|
|
#if HB_SIZE_MAX <= UINT_MAX
|
|
if( stream.total_out_hi32 != 0 )
|
|
*piResult = BZ_MEM_ERROR;
|
|
else
|
|
nDest = ( HB_SIZE ) stream.total_out_lo32;
|
|
#else
|
|
nDest = ( ( HB_SIZE ) stream.total_out_hi32 << 32 ) |
|
|
stream.total_out_lo32;
|
|
#endif
|
|
}
|
|
BZ2_bzDecompressEnd( &stream );
|
|
}
|
|
|
|
return nDest;
|
|
}
|
|
|
|
static int hb_bz2Uncompress( const char * szSrc, HB_SIZE nSrc,
|
|
char * szDst, HB_SIZE * pnDst )
|
|
{
|
|
bz_stream stream;
|
|
int iResult;
|
|
|
|
memset( &stream, 0, sizeof( stream ) );
|
|
|
|
stream.next_in = ( char * ) HB_UNCONST( szSrc );
|
|
stream.avail_in = ( unsigned int ) nSrc;
|
|
|
|
stream.next_out = szDst;
|
|
stream.avail_out = ( unsigned int ) *pnDst;
|
|
|
|
stream.bzalloc = hb_bz2Alloc;
|
|
stream.bzfree = hb_bz2Free;
|
|
#if 0
|
|
stream.opaque = NULL;
|
|
#endif
|
|
|
|
iResult = BZ2_bzDecompressInit( &stream, 0, 0 );
|
|
if( iResult == BZ_OK )
|
|
{
|
|
do
|
|
{
|
|
iResult = BZ2_bzDecompress( &stream );
|
|
}
|
|
while( iResult == BZ_OK );
|
|
|
|
if( iResult == BZ_STREAM_END )
|
|
{
|
|
#if HB_SIZE_MAX <= UINT_MAX
|
|
*pnDst = ( HB_SIZE ) stream.total_out_lo32;
|
|
#else
|
|
*pnDst = ( ( HB_SIZE ) stream.total_out_hi32 << 32 ) |
|
|
stream.total_out_lo32;
|
|
#endif
|
|
iResult = BZ_OK;
|
|
}
|
|
BZ2_bzDecompressEnd( &stream );
|
|
}
|
|
|
|
return iResult;
|
|
}
|
|
|
|
/* hb_bz2_Version() --> <cBZlibVersion> */
|
|
HB_FUNC( HB_BZ2_VERSION )
|
|
{
|
|
hb_retc( BZ2_bzlibVersion() );
|
|
}
|
|
|
|
/* hb_bz2_CompressBound( <cData> | <nDataLen> ) --> <nMaxCompressLen> */
|
|
HB_FUNC( HB_BZ2_COMPRESSBOUND )
|
|
{
|
|
if( HB_ISCHAR( 1 ) )
|
|
hb_retnint( hb_bz2CompressBound( hb_parclen( 1 ) ) );
|
|
else if( HB_ISNUM( 1 ) )
|
|
hb_retnint( hb_bz2CompressBound( ( HB_SIZE ) hb_parnint( 1 ) ) );
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
/* hb_bz2_UncompressLen( <cCompressedData>, [<@nResult>] )
|
|
--> <nUnCompressedDataLen> or -1 on error */
|
|
HB_FUNC( HB_BZ2_UNCOMPRESSLEN )
|
|
{
|
|
const char * szData = hb_parc( 1 );
|
|
|
|
if( szData )
|
|
{
|
|
HB_SIZE nLen = hb_parclen( 1 );
|
|
int iResult = BZ_OK;
|
|
|
|
if( nLen )
|
|
nLen = hb_bz2UncompressedSize( szData, nLen, &iResult );
|
|
|
|
if( iResult == BZ_OK )
|
|
hb_retnint( nLen );
|
|
else
|
|
hb_retni( -1 );
|
|
|
|
hb_storni( iResult, 2 );
|
|
}
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
/* hb_bz2_Compress( <cData>, [<nDstBufLen>|<@cBuffer>], [<@nResult>], [<nLevel>] )
|
|
--> <cCompressedData> or NIL on Error */
|
|
HB_FUNC( HB_BZ2_COMPRESS )
|
|
{
|
|
const char * szData = hb_parc( 1 );
|
|
|
|
if( szData )
|
|
{
|
|
HB_SIZE nLen = hb_parclen( 1 );
|
|
|
|
if( nLen )
|
|
{
|
|
PHB_ITEM pBuffer = HB_ISBYREF( 2 ) ? hb_param( 2, HB_IT_STRING ) : NULL;
|
|
HB_SIZE nDstLen;
|
|
char * pDest;
|
|
int iResult;
|
|
|
|
if( pBuffer )
|
|
{
|
|
if( ! hb_itemGetWriteCL( pBuffer, &pDest, &nDstLen ) )
|
|
pDest = NULL;
|
|
}
|
|
else
|
|
{
|
|
nDstLen = HB_ISNUM( 2 ) ? ( HB_SIZE ) hb_parnint( 2 ) :
|
|
( HB_SIZE ) hb_bz2CompressBound( nLen );
|
|
pDest = ( char * ) hb_xalloc( nDstLen + 1 );
|
|
}
|
|
|
|
if( pDest )
|
|
{
|
|
iResult = hb_bz2Compress( szData, nLen, pDest, &nDstLen,
|
|
hb_parnidef( 4, HB_BZ_COMPRESSION_DEFAULT ) );
|
|
if( ! pBuffer )
|
|
{
|
|
if( iResult == BZ_OK )
|
|
hb_retclen_buffer( pDest, nDstLen );
|
|
else
|
|
hb_xfree( pDest );
|
|
}
|
|
else if( iResult == BZ_OK )
|
|
hb_retclen( pDest, nDstLen );
|
|
}
|
|
else
|
|
iResult = BZ_MEM_ERROR;
|
|
|
|
hb_storni( iResult, 3 );
|
|
}
|
|
else
|
|
{
|
|
hb_retc_null();
|
|
hb_storni( BZ_OK, 3 );
|
|
}
|
|
}
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
/* hb_bz2_Uncompress( <cCompressedData>, [<nDstBufLen>|<@cBuffer>], [<@nResult>] )
|
|
--> <cUnCompressedData> or NIL on Error */
|
|
HB_FUNC( HB_BZ2_UNCOMPRESS )
|
|
{
|
|
PHB_ITEM pBuffer = HB_ISBYREF( 2 ) ? hb_param( 2, HB_IT_STRING ) : NULL;
|
|
const char * szData = hb_parc( 1 );
|
|
|
|
if( szData )
|
|
{
|
|
HB_SIZE nLen = hb_parclen( 1 );
|
|
|
|
if( nLen )
|
|
{
|
|
HB_SIZE nDstLen;
|
|
char * pDest = NULL;
|
|
int iResult = BZ_OK;
|
|
|
|
if( pBuffer )
|
|
{
|
|
if( ! hb_itemGetWriteCL( pBuffer, &pDest, &nDstLen ) )
|
|
iResult = BZ_MEM_ERROR;
|
|
}
|
|
else
|
|
{
|
|
nDstLen = HB_ISNUM( 2 ) ? ( HB_SIZE ) hb_parnint( 2 ) :
|
|
hb_bz2UncompressedSize( szData, nLen, &iResult );
|
|
if( iResult == BZ_OK )
|
|
{
|
|
pDest = ( char * ) hb_xalloc( nDstLen + 1 );
|
|
if( ! pDest )
|
|
iResult = BZ_MEM_ERROR;
|
|
}
|
|
}
|
|
|
|
if( iResult == BZ_OK )
|
|
{
|
|
iResult = hb_bz2Uncompress( szData, nLen, pDest, &nDstLen );
|
|
|
|
if( ! pBuffer )
|
|
{
|
|
if( iResult == BZ_OK )
|
|
hb_retclen_buffer( pDest, nDstLen );
|
|
else
|
|
hb_xfree( pDest );
|
|
}
|
|
else if( iResult == BZ_OK )
|
|
hb_retclen( pDest, nDstLen );
|
|
}
|
|
hb_storni( iResult, 3 );
|
|
}
|
|
else
|
|
{
|
|
hb_retc_null();
|
|
hb_storni( BZ_OK, 3 );
|
|
}
|
|
}
|
|
else
|
|
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|