* Makefile
- source/hbpcre
- source/hbzlib
* external/Makefile
+ external/pcre
+ external/zlib
* external/pcre/Makefile
* external/zlib/Makefile
* external/libhpdf/Makefile
* external/libpng/Makefile
* include/hbsetup.h
* include/hbzlib.h
* include/hbregex.h
* source/rtl/hbzlibgz.c
* source/rtl/Makefile
* source/rtl/hbregexc.c
* source/rtl/hbregex.c
* source/rtl/hbzlib.c
* source/Makefile
* contrib/xhb/Makefile
* contrib/hbmzip/Makefile
* utils/hbmk2/hbmk2.prg
* config/global.mk
* config/lib.mk
* config/bin.mk
* config/detect.mk
* config/darwin/libs.mk
* config/linux/libs.mk
* config/wce/mingwarm.mk
* config/wce/poccarm.mk
* config/wce/msvcarm.mk
* config/win/xcc.mk
* config/win/mingw.mk
* config/win/pocc.mk
* config/win/bcc.mk
* config/win/watcom.mk
* config/win/icc.mk
* config/win/cygwin.mk
* config/win/msvc.mk
* config/dyn.mk
* config/os2/watcom.mk
* config/os2/gcc.mk
* config/bsd/libs.mk
* config/hpux/libs.mk
* config/sunos/libs.mk
* Changed the way embedded zlib and pcre are handled:
- They now reside in /external dir.
- They are now excluded from Harbour dynlib. This means they
will now be linked statically on non-*nix systems and
dynamically on *nix systems. On *nix it's probably easy to
switch to link statically. On non-*nix this is quite
complicated to do.
- If these libs are provided by the system, those will be used.
- On non-*nix systems the locally hosted versions will be used,
unless user overrides them using HB_INC_PCRE or HB_INC_ZLIB.
- There is currently no officially supported way to force usage
of locally hosted libs.
- If PCRE lib is forcibly disabled or not found, build system
will fall back to POSIX regex on *nix systems and Borland regex
with bcc compiler. Otherwise it will stop the build with an error.
- If zlib is forcibly disabled or not found, an error will be
generated at build-time (in hbrtl). hbmzip is simply skipped
in this case.
- hbmk2 will use local builds of these libs if they are present
in lib dir.
; TOFIX: hbmk script.
; TOFIX: dos builds. cmdline lenghts are most probably too big for them.
; NOTE: Bumps are expected.
; NOTE: I've yet to test/verify it.
- external/libhpdf/ori_src
- external/libhpdf/ori_dst
- Deleted. (added in prev commit by oversight)
163 lines
4.8 KiB
C
163 lines
4.8 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
*
|
|
*
|
|
* Copyright 2007 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
|
|
* www - http://www.harbour-project.org
|
|
*
|
|
* 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 software; see the file COPYING. If not, write to
|
|
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
|
|
*
|
|
* 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.
|
|
*
|
|
*/
|
|
|
|
#define _HB_REGEX_INTERNAL_
|
|
#include "hbregex.h"
|
|
#include "hbapiitm.h"
|
|
#include "hbapierr.h"
|
|
|
|
static void hb_regfree( PHB_REGEX pRegEx )
|
|
{
|
|
HB_SYMBOL_UNUSED( pRegEx );
|
|
}
|
|
|
|
static int hb_regcomp( PHB_REGEX pRegEx, const char * szRegEx )
|
|
{
|
|
HB_SYMBOL_UNUSED( pRegEx );
|
|
HB_SYMBOL_UNUSED( szRegEx );
|
|
return -1;
|
|
}
|
|
|
|
static int hb_regexec( PHB_REGEX pRegEx, const char * szString, ULONG ulLen,
|
|
int iMatches, HB_REGMATCH * aMatches )
|
|
{
|
|
HB_SYMBOL_UNUSED( pRegEx );
|
|
HB_SYMBOL_UNUSED( szString );
|
|
HB_SYMBOL_UNUSED( ulLen );
|
|
HB_SYMBOL_UNUSED( iMatches );
|
|
HB_SYMBOL_UNUSED( aMatches );
|
|
return -1;
|
|
}
|
|
|
|
static HB_REG_FREE s_reg_free = hb_regfree;
|
|
static HB_REG_COMP s_reg_comp = hb_regcomp;
|
|
static HB_REG_EXEC s_reg_exec = hb_regexec;
|
|
|
|
void hb_regexInit( HB_REG_FREE pFree, HB_REG_COMP pComp, HB_REG_EXEC pExec )
|
|
{
|
|
s_reg_free = pFree;
|
|
s_reg_comp = pComp;
|
|
s_reg_exec = pExec;
|
|
}
|
|
|
|
/* This releases regex when called from the garbage collector */
|
|
HB_GARBAGE_FUNC( hb_regexRelease )
|
|
{
|
|
( s_reg_free )( ( PHB_REGEX ) Cargo );
|
|
}
|
|
|
|
PHB_REGEX hb_regexCompile( const char *szRegEx, ULONG ulLen, int iFlags )
|
|
{
|
|
PHB_REGEX pRegEx;
|
|
|
|
HB_SYMBOL_UNUSED( ulLen );
|
|
|
|
pRegEx = ( PHB_REGEX ) hb_gcAlloc( sizeof( HB_REGEX ), hb_regexRelease );
|
|
hb_gcLock( pRegEx );
|
|
memset( pRegEx, 0, sizeof( HB_REGEX ) );
|
|
pRegEx->fFree = TRUE;
|
|
pRegEx->iFlags = iFlags;
|
|
|
|
if( ( s_reg_comp )( pRegEx, szRegEx ) != 0 )
|
|
{
|
|
hb_gcFree( pRegEx );
|
|
pRegEx = NULL;
|
|
}
|
|
|
|
return pRegEx;
|
|
}
|
|
|
|
PHB_REGEX hb_regexGet( PHB_ITEM pRegExItm, int iFlags )
|
|
{
|
|
PHB_REGEX pRegEx = NULL;
|
|
|
|
if( pRegExItm )
|
|
{
|
|
if( HB_IS_POINTER( pRegExItm ) )
|
|
{
|
|
pRegEx = ( PHB_REGEX ) hb_itemGetPtrGC( pRegExItm, hb_regexRelease );
|
|
}
|
|
else if( HB_IS_STRING( pRegExItm ) )
|
|
{
|
|
ULONG ulLen = hb_itemGetCLen( pRegExItm );
|
|
const char * szRegEx = hb_itemGetCPtr( pRegExItm );
|
|
if( ulLen > 0 )
|
|
pRegEx = hb_regexCompile( szRegEx, ulLen, iFlags );
|
|
}
|
|
}
|
|
|
|
if( !pRegEx )
|
|
hb_errRT_BASE_SubstR( EG_ARG, 3012, "Invalid Regular expression", HB_ERR_FUNCNAME, 1, pRegExItm );
|
|
|
|
return pRegEx;
|
|
}
|
|
|
|
void hb_regexFree( PHB_REGEX pRegEx )
|
|
{
|
|
if( pRegEx && pRegEx->fFree )
|
|
{
|
|
( s_reg_free )( pRegEx );
|
|
hb_gcFree( pRegEx );
|
|
}
|
|
}
|
|
|
|
BOOL hb_regexMatch( PHB_REGEX pRegEx, const char *szString, ULONG ulLen, BOOL fFull )
|
|
{
|
|
HB_REGMATCH aMatches[ HB_REGMATCH_SIZE( 1 ) ];
|
|
BOOL fMatch;
|
|
|
|
fMatch = ( s_reg_exec )( pRegEx, szString, ulLen, 1, aMatches ) > 0;
|
|
return fMatch && ( !fFull ||
|
|
( HB_REGMATCH_SO( aMatches, 0 ) == 0 &&
|
|
HB_REGMATCH_EO( aMatches, 0 ) == ( int ) ulLen ) );
|
|
}
|