* include/harbour.hbx
* include/hbchksum.h
* src/harbour.def
* src/rtl/hbmd5.c
+ added new C function
void hb_hmac_md5( const void * key, HB_SIZE nKeyLen,
const void * message, HB_SIZE nMsgLen,
char * digest );
+ added new PRG function
HB_HMAC_MD5( <cMessage>, <cKey> ) -> <cMAC>
; HMAC MD5 is used in some authentication methods i.e. CRAM-MD5
authentication in SMTP protocol
* src/rtl/gttrm/gttrm.c
+ enable extended XTERM colors automatically when xterm-16color,
xterm-256color, xterm+256color, xterm-88color, rxvt-16color,
rxvt-256color, rxvt-98color or putty terminal is detected
+ added support for HB_GTI_SCREENDEPTH
* contrib/gtqtc/gtqtc1.cpp
+ set clipboard data also into selection buffer on platforms which
support it
+ when main clipboard buffer is empty retrieve clipboard data from
selection buffer and if it's empty too from find buffer
* include/harbour.hbx
* src/harbour.def
* src/vm/memvars.c
+ added new PRG function
__mvGetDef( <cMemvar> [, <xDefault> ] ) -> <xValue>
it works in similar way to __mvGet() but if <cMemvar> does
not exist then it returns <xDefault> or NIL instead of RTE
* contrib/hbwin/hbwin.hbx
+ added missing declarations for win_osIs10() and win_osIs81()
* contrib/hbssl/ssl.c
! fixed compilation with OpenSSL < 0.9.8k
* contrib/sddodbc/core.c
* pacified warning
* contrib/xhb/hbxml.c
* contrib/xhb/hbxml.h
! fixed CDATA terminator, it should be "]]>" instead of " ]]>"
+ added support for HBXML_STYLE_NONEWLINE flag
* src/3rd/pcre/Makefile
! typo wince -> wce
* src/main/Makefile
* use harbour.rc only in MS-Windows builds - it fixes OS2 OpenWatcom
builds
* config/global.mk
! in DOS builds check if the 'uname' exists before running it
* include/hbapigt.h
* include/hbgtcore.h
* src/rtl/hbgtcore.c
* src/rtl/inkey.c
* src/rtl/inkeyapi.c
* contrib/xhb/xhbfunc.c
+ added 3-rd parameter to hb_inkeySetText() function. When this parameter
is true then ';' is not translated to Chr( 13 ) but DOS and UNIX EOLs
are translated to Chr( 13 )
+ added logical parameter to HB_GTI_CLIPBOARDPASTE which allows to set
text without ';' translation but with platform independent EOLs
* src/rtl/memoedit.prg
* utils/hbmk2/hbmk2.prg
* contrib/hbnetio/utils/hbnetio/_console.prg
* extras/dbu/dbu52.patch
* extras/dbu/dbu53.patch
* use hb_gtInfo( HB_GTI_CLIPBOARDPASTE, .T. ) instead of
hb_gtInfo( HB_GTI_CLIPBOARDPASTE ) for pasting data from clipboard
with platform independent EOLs and ';' characters
228 lines
6.2 KiB
C
228 lines
6.2 KiB
C
/*
|
|
* HBXML - XML DOM oriented routines
|
|
*
|
|
* Copyright 2003 Giancarlo Niccolai <gian@niccolai.ws>
|
|
* See also MXML library related copyright below
|
|
*
|
|
* 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.
|
|
*
|
|
*/
|
|
|
|
/*
|
|
* MXML (Mini XML) Library related copyright notice.
|
|
* (referring to Harbour/xHarbour version).
|
|
*
|
|
* This source file contains a modified version of MXML (Mini XML)
|
|
* library, developed by Giancarlo Niccolai. MXML is released under
|
|
* LGPL license; this modified version (called HBXML) is released under
|
|
* GPL with Harbour exception. HBXML license does not extends into
|
|
* MXML; HBXML and any modification to HBXML is to be considered as
|
|
* a part of Harbour or xHarbour projects, as it is modified to
|
|
* be specifically working in the context of the compiler's RTL.
|
|
*
|
|
* Original MXML lib can be obtained requesting it at
|
|
* Giancarlo Niccolai <giancarlo@niccolai.org>
|
|
*/
|
|
|
|
#ifndef HB_XML_H
|
|
#define HB_XML_H
|
|
|
|
/* Standard definitions */
|
|
#ifdef HB_OS_MAC
|
|
#define MXML_LINE_TERMINATOR '\r'
|
|
#define MXML_SOFT_LINE_TERMINATOR '\n'
|
|
#else
|
|
/* Notice, this works for both Unix and Windows */
|
|
#define MXML_LINE_TERMINATOR '\n'
|
|
#define MXML_SOFT_LINE_TERMINATOR '\r'
|
|
#endif
|
|
|
|
#define MXML_EOF -256
|
|
|
|
#define MXML_ALLOC_BLOCK 128
|
|
#define MXML_MAX_DEPTH 64
|
|
|
|
/* Styles */
|
|
#define MXML_STYLE_INDENT 0x0001
|
|
#define MXML_STYLE_TAB 0x0002
|
|
#define MXML_STYLE_THREESPACES 0x0004
|
|
#define MXML_STYLE_NOESCAPE 0x0008
|
|
#define MXML_STYLE_NONEWLINE 0x0010
|
|
|
|
/* Status values */
|
|
|
|
typedef enum
|
|
{
|
|
MXML_STATUS_ERROR = 0,
|
|
MXML_STATUS_OK = 1,
|
|
MXML_STATUS_MORE,
|
|
MXML_STATUS_DONE,
|
|
MXML_STATUS_UNDEFINED,
|
|
MXML_STATUS_MALFORMED
|
|
} MXML_STATUS;
|
|
|
|
/* Error codes */
|
|
typedef enum
|
|
{
|
|
MXML_ERROR_NONE = 0,
|
|
MXML_ERROR_IO = 1,
|
|
MXML_ERROR_NOMEM,
|
|
|
|
MXML_ERROR_OUTCHAR,
|
|
MXML_ERROR_INVNODE,
|
|
MXML_ERROR_INVATT,
|
|
MXML_ERROR_MALFATT,
|
|
MXML_ERROR_INVCHAR,
|
|
MXML_ERROR_NAMETOOLONG,
|
|
MXML_ERROR_ATTRIBTOOLONG,
|
|
MXML_ERROR_VALATTOOLONG,
|
|
MXML_ERROR_UNCLOSED,
|
|
MXML_ERROR_UNCLOSEDENTITY,
|
|
MXML_ERROR_WRONGENTITY
|
|
} MXML_ERROR_CODE;
|
|
|
|
/* Node types */
|
|
|
|
typedef enum
|
|
{
|
|
MXML_TYPE_TAG = 0,
|
|
MXML_TYPE_COMMENT,
|
|
MXML_TYPE_PI,
|
|
MXML_TYPE_DIRECTIVE,
|
|
MXML_TYPE_DATA,
|
|
MXML_TYPE_CDATA, /* Used for <![CDATA[ nodes */
|
|
MXML_TYPE_DOCUMENT /* used for document level root node */
|
|
} MXML_NODE_TYPE;
|
|
|
|
/* Refil function */
|
|
struct tag_mxml_refil;
|
|
struct tag_mxml_output;
|
|
|
|
typedef void ( *MXML_REFIL_FUNC )( struct tag_mxml_refil * ref );
|
|
typedef void ( *MXML_OUTPUT_FUNC )( struct tag_mxml_output * out, const char * data, HB_ISIZ len );
|
|
|
|
/* --- Structures holding the XML data --- */
|
|
|
|
/* Re-filler */
|
|
|
|
typedef struct tag_mxml_refil
|
|
{
|
|
/* status variables */
|
|
MXML_STATUS status;
|
|
MXML_ERROR_CODE error;
|
|
|
|
/* buffer for reading data */
|
|
unsigned char * buffer;
|
|
HB_ISIZ bufsize; /* size of the whole buffer */
|
|
HB_ISIZ buflen; /* valid characters in the current buffer */
|
|
HB_ISIZ bufpos; /* current position */
|
|
|
|
/* length of the stream for implementing progress indicators */
|
|
HB_ISIZ streampos;
|
|
HB_ISIZ streamlen;
|
|
|
|
/* callback funcs */
|
|
MXML_REFIL_FUNC refil_func;
|
|
|
|
/* ungetc implementation */
|
|
int sparechar;
|
|
|
|
/* data available for callback functions */
|
|
union
|
|
{
|
|
HB_FHANDLE hFile;
|
|
void * vPtr;
|
|
} u;
|
|
|
|
} MXML_REFIL;
|
|
|
|
|
|
typedef struct tag_mxml_output
|
|
{
|
|
/* status variables */
|
|
MXML_STATUS status;
|
|
MXML_ERROR_CODE error;
|
|
|
|
/* output operation */
|
|
MXML_OUTPUT_FUNC output_func;
|
|
|
|
/* data to implement progress indicators */
|
|
int node_count;
|
|
int node_done;
|
|
|
|
/* data available for callback functions */
|
|
union
|
|
{
|
|
HB_FHANDLE hFile;
|
|
void * vPtr;
|
|
} u;
|
|
|
|
} MXML_OUTPUT;
|
|
|
|
/* tag mxml self growing string */
|
|
typedef struct
|
|
{
|
|
char * buffer;
|
|
HB_ISIZ allocated;
|
|
HB_ISIZ length;
|
|
} MXML_SGS;
|
|
|
|
typedef struct
|
|
{
|
|
PHB_ITEM pName;
|
|
PHB_ITEM pValue;
|
|
} HBXML_ATTRIBUTE, * PHBXML_ATTRIBUTE;
|
|
|
|
|
|
/* Allocator and deletor functions are meant to be redeclared by includers */
|
|
#ifndef MXML_ALLOCATOR
|
|
#define MXML_ALLOCATOR hb_xgrab
|
|
#endif
|
|
|
|
#ifndef MXML_DELETOR
|
|
#define MXML_DELETOR hb_xfree
|
|
#endif
|
|
|
|
#ifndef MXML_REALLOCATOR
|
|
#define MXML_REALLOCATOR hb_xrealloc
|
|
#endif
|
|
|
|
#endif
|