From 46beadfeb32e861ff18937517c2ae6a864334453 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 10 Jun 2008 14:25:45 +0000 Subject: [PATCH] 2008-06-10 16:24 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * xhb/Makefile * xhb/common.mak + xhb/freadlin.c + Adopted HB_FREADLINE(). Work of Marcelo Lombardo / xhb. ! Fixed one potential leak (probably not exploited by current control flow). ; Please test. * xhb/hbcrypt.c % Minor opt. (HB_ERR_FUNCNAME) --- harbour/ChangeLog | 13 ++ harbour/contrib/xhb/Makefile | 1 + harbour/contrib/xhb/common.mak | 1 + harbour/contrib/xhb/freadlin.c | 245 +++++++++++++++++++++++++++++++++ harbour/contrib/xhb/hbcrypt.c | 4 +- 5 files changed, 262 insertions(+), 2 deletions(-) create mode 100644 harbour/contrib/xhb/freadlin.c diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 93bb80e825..e404000757 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,19 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-06-10 16:24 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * xhb/Makefile + * xhb/common.mak + + xhb/freadlin.c + + Adopted HB_FREADLINE(). + Work of Marcelo Lombardo / xhb. + ! Fixed one potential leak (probably not exploited + by current control flow). + ; Please test. + + * xhb/hbcrypt.c + % Minor opt. (HB_ERR_FUNCNAME) + 2008-06-10 16:06 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + contrib/xhb/hbcrypt.c + contrib/xhb/hbnxs.h diff --git a/harbour/contrib/xhb/Makefile b/harbour/contrib/xhb/Makefile index 9f5831434f..57431d3dd9 100644 --- a/harbour/contrib/xhb/Makefile +++ b/harbour/contrib/xhb/Makefile @@ -5,6 +5,7 @@ ROOT = ../../ C_SOURCES=\ + freadlin.c \ hbcrypt.c \ hbxml.c \ hbsyslog.c \ diff --git a/harbour/contrib/xhb/common.mak b/harbour/contrib/xhb/common.mak index aec01846b9..398bc28a1f 100644 --- a/harbour/contrib/xhb/common.mak +++ b/harbour/contrib/xhb/common.mak @@ -26,6 +26,7 @@ PRG_HEADERS = \ xhbextrn.ch \ LIB_OBJS = \ + $(OBJ_DIR)freadlin$(OBJEXT) \ $(OBJ_DIR)hbcrypt$(OBJEXT) \ $(OBJ_DIR)hbxml$(OBJEXT) \ $(OBJ_DIR)hbsyslog$(OBJEXT) \ diff --git a/harbour/contrib/xhb/freadlin.c b/harbour/contrib/xhb/freadlin.c new file mode 100644 index 0000000000..9cfba691d2 --- /dev/null +++ b/harbour/contrib/xhb/freadlin.c @@ -0,0 +1,245 @@ +/* + * $Id$ + */ + +/* + * xHarbour Project source code: + * Text file reading functions + * + * Copyright 2003 Marcelo Lombardo - lombardo@uol.com.br + * http://www.xharbour.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. + * + */ + +#include + +#include "hbapi.h" +#include "hbapifs.h" +#include "hbset.h" +#include "hbapiitm.h" +#include "hbapierr.h" + +#define READING_BLOCK 4096 + +BYTE * hb_fsReadLine( FHANDLE hFileHandle, LONG *plBuffLen, char ** Term, int * iTermSizes, USHORT iTerms, BOOL * bFound, BOOL *bEOF ) +{ + USHORT uiPosTerm = 0, iPos, uiPosition; + USHORT nTries; + LONG lRead = 0, lOffset, lSize; + BYTE * pBuff; + + HB_TRACE(HB_TR_DEBUG, ("hb_fsReadLine(%p, %ld, %p, %p, %hu, %i, %i)", hFileHandle, *plBuffLen, Term, iTermSizes, iTerms, *bFound, *bEOF )); + + *bFound = 0; + *bEOF = 0; + nTries = 0; + lOffset = 0; + lSize = *plBuffLen; + + if( *plBuffLen < 10 ) + { + *plBuffLen = READING_BLOCK; + } + + pBuff = (BYTE*) hb_xgrab( *plBuffLen ); + + do + { + if(nTries>0) + { + /* pBuff can be enlarged to hold the line as needed.. */ + lSize = ( *plBuffLen * ( nTries + 1 ) ) + 1; + pBuff = (BYTE *) hb_xrealloc( pBuff, lSize ); + lOffset += lRead; + } + + /* read from file */ + lRead = hb_fsReadLarge( hFileHandle, pBuff + lOffset, lSize-lOffset ); + + /* scan the read buffer */ + + if (lRead>0) + { + for( iPos=0; iPos 0 ); + + return( pBuff ); +} + +/* PRG level fReadLine( , <@buffer>, [], [] ) */ + +HB_FUNC( HB_FREADLINE ) +{ + PHB_ITEM pTerm1; + FHANDLE hFileHandle = (FHANDLE) hb_parnl( 1 ); + char ** Term; + BYTE * pBuffer; + int * iTermSizes; + LONG lSize = hb_parnl(4); + USHORT i, iTerms; + BOOL bFound, bEOF; + + if( ( !ISBYREF( 2 ) ) || ( !ISNUM( 1 ) ) ) + { + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, 4, hb_paramError(1), hb_paramError(2), hb_paramError(3), hb_paramError(4) ); + return; + } + + if( ISARRAY( 3 ) || ISCHAR( 3 ) ) + { + if( ISARRAY( 3 ) ) + { + pTerm1 = hb_param( 3, HB_IT_ARRAY ); + iTerms = (int) hb_arrayLen( pTerm1 ); + + if( iTerms <= 0 ) + { + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, 4, + hb_paramError(1), hb_paramError(2), + hb_paramError(3), hb_paramError(4) ); + return; + } + + Term = (char**) hb_xgrab( sizeof(char*) * iTerms ); + iTermSizes = (int *) hb_xgrab( sizeof(int) * iTerms ); + + for(i=0;i