* src/vm/runner.c
! Minor to prev.
* include/hbapi.h
* src/vm/extend.c
+ Added hb_parnsize(), hb_retnsize(), hb_stornsize() functions.
; NOTE: These should be used in place of hb_parnl(), hb_retnl(),
hb_stornl() when passing HB_SIZE types.
; TODO: Use them all accross Harbour if they are correct and
after being finalized.
* src/vm/itemapi.c
+ Added hb_itemGetNSize(), hb_itemPutNSize() functions.
* DATETIME stuff in hb_itemGetNL() marked as HB_LEGACY_LEVEL3.
; QUESTION: It's marked as to be deleted in the TODO, so maybe we should
rather delete it.
* include/hbapiitm.h
* src/rtl/filesys.c
+ hb_fsReadAt(), hb_fsWriteAt(): Added support for Win64 HB_SIZE.
; QUESTION: I assume these functions have the purpose of being
atomic seek + read without moving the file pointer,
which means current modification isn't safe. How
can this be solved given Windows doesn't seem to have
64-bit read/write API calls?
! Fixed old copy-paste typos in Windows OVERLAPPED initialization,
where the lines were ended with command instead of semicolon,
they didn't cause any harm though in their former location.
% Reverted a minor change from prev commit to make it
possibly a little bit faster, like it was before.
* src/rtl/hbzlib.c
+ Added casts (at external interface calls) and other fixes to
make it build for Win64 without warnings.
* src/rdd/dbfntx/dbfntx1.c
* src/rdd/dbfnsx/dbfnsx1.c
* src/rdd/dbfcdx/dbfcdx1.c
* src/rdd/dbffpt/dbffpt1.c
* contrib/rddbmcdx/bmdbfcdx.c
* HB_ULONG -> HB_SIZE where appropriate to avoid Win64 errors
and some warnings. I'm still not comfortable to touch this
code, but it could certainly need a type cleanup.
* include/hbdefs.h
+ Added HB_PFS macro which holds the printf() format string
for HB_SIZE value.
; TODO: Use it all accross Harbour.
* contrib/hbmysql/mysql.c
* contrib/sddmy/sddmy.c
* contrib/hbmzip/hbmzip.c
* contrib/hbcurl/hbcurl.c
* contrib/hbhpdf/harupdf.c
* contrib/hbpgsql/postgres.c
* contrib/rddads/adsfunc.c
* contrib/rddads/ads1.c
* contrib/hbfimage/fi_wrp.c
* contrib/sddodbc/sddodbc.c
* contrib/hbgd/gdwrp.c
* contrib/hbwin/wapi_wingdi.c
* contrib/hbwin/wapi_winbase.c
* contrib/hbwin/wapi_winuser.c
* contrib/hbwin/win_bmp.c
* contrib/hbwin/win_prn1.c
* contrib/hbwin/win_regc.c
* contrib/hbssl/evpciph.c
* contrib/hbssl/ssl.c
* contrib/hbssl/bio.c
* contrib/hbssl/sslctx.c
* contrib/hbssl/evpenc.c
* contrib/hbssl/pem.c
* contrib/hbssl/rand.c
* contrib/hbssl/evp.c
+ Added necessary casts at external component boundaries to
make Win64 builds warning-free.
* contrib/hbct/ctstrfil.c
+ HB_ISIZ -> HB_FOFFSET, hb_fsSeek() usage, other type cleanup
to handle file offsets correctly.
* contrib/xhb/hbnxs.h
* contrib/xhb/hbcrypt.c
! Fixed warnings for Win64.
* contrib/hbwin/win_prn3.c
* contrib/xhb/dbf2txt.c
* contrib/xhb/fparse.c
* int -> HB_ISIZ for Win64.
* contrib/xhb/freadlin.c
* hb_fsSeek() -> hb_fsSeekLarge().
* contrib/sddfb/sddfb.c
* Minor type cleanup to make Win64 warning-free.
* contrib/hbsqlit3/hbsqlit3.c
+ Added necessary casts at external interface calls.
% Deleted one dummy operation from SQLITE3_FILE_TO_BUFF().
* contrib/rddsql/sqlmix.c
* contrib/rddads/adsx.c
* HB_ULONG -> HB_SIZE.
* contrib/gtwvg/gtwvg.c
* contrib/gtwvg/wvggui.c
* contrib/gtwvg/wvgcuig.c
* contrib/gtwvg/wvgwin.c
* contrib/gtwvg/wvgutils.c
* contrib/gtwvg/wvgcore.c
! int -> HB_ISIZ/HB_SIZE
+ Added necessary casts at external component boundaries to
make Win64 warning-free.
* contrib/rddads/ads1.c
* HB_ULONG -> HB_SIZE
* contrib/hbtip/utils.c
* int -> HB_ISIZ
! Fixed to use HB_FOFFSET type to save/restore file position.
* ChangeLog
+ Added missing item to previous log entry:
! Fixed hb_fsCurDirBuff() for Win64.
; It's quite large commit, nevertheless I'd highly appreciate
peer review, and certainly there will be places which need
better or different solution for Win64.
683 lines
16 KiB
C
683 lines
16 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
*
|
|
* FPARSE()
|
|
* FPARSEEX()
|
|
* FPARSELINE()
|
|
* FLINECOUNT()
|
|
* FCHARCOUNT()
|
|
* FWORDCOUNT()
|
|
*
|
|
* Copyright 2004 Andi Jahja <xharbour@cbn.net.id>
|
|
* www - http://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.
|
|
*
|
|
*/
|
|
|
|
/*
|
|
FPARSE( cFile, cDelimiter ) -> array
|
|
|
|
Purpose:
|
|
Parse a delimited text file.
|
|
|
|
Parameters:
|
|
cFile - file to process
|
|
cDelimiter - delimiter, default is comma
|
|
|
|
Returns:
|
|
Upon success -> Two dimensional array, of which each element contains
|
|
the results of parsing
|
|
Upon error -> An empty array
|
|
*/
|
|
|
|
#include "hbapi.h"
|
|
#include "hbapifs.h"
|
|
#include "hbapiitm.h"
|
|
#include "hbfast.h"
|
|
|
|
/* adjustable, but this should be sufficient in normal situation */
|
|
#define MAX_READ 4096
|
|
/*----------------------------------------------------------------------------*/
|
|
void hb_ParseLine( PHB_ITEM pReturn, const char * szText, int iDelimiter, int * iWord )
|
|
{
|
|
if( szText )
|
|
{
|
|
HB_ISIZ iLen = strlen( szText );
|
|
|
|
if( iLen > 0 )
|
|
{
|
|
PHB_ITEM pTemp = hb_itemNew( NULL );
|
|
HB_ISIZ i = 0;
|
|
int word_count = 0 ;
|
|
/* booked enough memory */
|
|
char * szResult = ( char * ) hb_xgrab( iLen + 1 );
|
|
|
|
#if 0
|
|
while( iLen )
|
|
{
|
|
if( szText[ iLen - 1 ] && ! HB_ISSPACE( szText[ iLen - 1 ] ) )
|
|
break;
|
|
|
|
iLen--;
|
|
}
|
|
|
|
szText[ iLen ] = 0;
|
|
|
|
iLen = strlen( szText );
|
|
#endif
|
|
|
|
while( i < iLen )
|
|
{
|
|
HB_ISIZ ui = 0;
|
|
|
|
hb_xmemset( szResult, ' ', iLen + 1 );
|
|
|
|
/* an '"' found, loop until the next one is found */
|
|
if( szText[ i ] == '"' )
|
|
{
|
|
/* an '"' after '"' ? */
|
|
if( szText[ i + 1 ] != '"' )
|
|
{
|
|
szResult[ ui ] = szText[ i + 1 ];
|
|
}
|
|
else
|
|
{
|
|
szResult[ ui ] = '\0';
|
|
}
|
|
|
|
++i;
|
|
|
|
while( ++i < iLen )
|
|
{
|
|
if( szText[ i - 1 ] == '"' )
|
|
{
|
|
szResult[ ui + 1 ] = '\0';
|
|
break;
|
|
}
|
|
else
|
|
{
|
|
if( szText[ i ] == '"' )
|
|
szResult[ ui + 1 ] = '\0';
|
|
else
|
|
szResult[ ++ui ] = szText[ i ];
|
|
}
|
|
}
|
|
word_count++;
|
|
hb_arrayAddForward( pReturn, hb_itemPutC( pTemp, szResult ));
|
|
}
|
|
/* delimiter found */
|
|
else if( szText[ i ] == iDelimiter )
|
|
{
|
|
/* first delimiter found but no word yet */
|
|
if( word_count == 0 )
|
|
{
|
|
/* add an empty string */
|
|
szResult[ ui ] = '\0';
|
|
}
|
|
else
|
|
{
|
|
/* we have already have the first word */
|
|
/* check next character */
|
|
if( szText[ i - 1 ] == iDelimiter )
|
|
{
|
|
/* delimiter after delimiter */
|
|
/* just add an empty string */
|
|
szResult[ ui ] = '\0';
|
|
}
|
|
else
|
|
{
|
|
/* ",,0" */
|
|
/* it is not a delimiter */
|
|
/* move to next character */
|
|
++i;
|
|
szResult[ ui ] = szText[ i ];
|
|
|
|
while( ++i < iLen )
|
|
{
|
|
if( szText[ i ] == iDelimiter )
|
|
{
|
|
break;
|
|
}
|
|
else
|
|
{
|
|
szResult[ ++ui ] = szText[ i ];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
word_count++;
|
|
szResult[ ui + 1 ] = '\0';
|
|
hb_arrayAddForward( pReturn, hb_itemPutC( pTemp, szResult ) );
|
|
}
|
|
else
|
|
{
|
|
szResult[ ui ] = szText[ i ];
|
|
|
|
while( ++i < iLen )
|
|
{
|
|
if( szText[ i ] == iDelimiter )
|
|
{
|
|
szResult[ ui + 1 ] = '\0';
|
|
break;
|
|
}
|
|
else if( szText[ i ] == '"' )
|
|
{
|
|
szResult[ ui ] = szText[ i + 1 ];
|
|
++i;
|
|
|
|
while( ++i < iLen )
|
|
{
|
|
if( szText[ i - 1 ] == '"' )
|
|
{
|
|
szResult[ ui + 1 ] = '\0';
|
|
break;
|
|
}
|
|
else
|
|
{
|
|
if( szText[ i ] == '"' )
|
|
{
|
|
szResult[ ui + 1 ] = '\0';
|
|
break;
|
|
}
|
|
else
|
|
{
|
|
szResult[ ++ui ] = szText[ i ];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
szResult[ ++ui ] = szText[ i ];
|
|
}
|
|
}
|
|
word_count++;
|
|
szResult[ ui + 1 ] = '\0';
|
|
hb_arrayAddForward( pReturn, hb_itemPutC( pTemp, szResult ) );
|
|
}
|
|
|
|
i++;
|
|
}
|
|
|
|
/* last character in passed string is a delimiter */
|
|
/* just add an empty string */
|
|
if( szText[ iLen - 1 ] == iDelimiter )
|
|
{
|
|
word_count++;
|
|
hb_arrayAddForward( pReturn, hb_itemPutC( pTemp, NULL ) );
|
|
}
|
|
|
|
/* store number of words */
|
|
*iWord = word_count;
|
|
|
|
/* clean up */
|
|
hb_xfree( szResult );
|
|
|
|
hb_itemRelease( pTemp );
|
|
}
|
|
}
|
|
}
|
|
|
|
/*----------------------------------------------------------------------------*/
|
|
static char ** hb_tokensplit( char * string, HB_BYTE delimiter, int iCharCount, int * iWord )
|
|
{
|
|
char *buffer, *bufptr;
|
|
char **token_list;
|
|
char last_char = '\0';
|
|
int word_count = 0, word_nbr;
|
|
|
|
buffer = ( char * ) hb_xgrab( iCharCount + 1 );
|
|
|
|
bufptr = buffer;
|
|
|
|
while( *string )
|
|
{
|
|
if( *string == delimiter )
|
|
{
|
|
while( *string == delimiter )
|
|
{
|
|
string++;
|
|
}
|
|
|
|
if(bufptr > buffer)
|
|
{
|
|
word_count++;
|
|
last_char = *bufptr++ = '\0';
|
|
}
|
|
}
|
|
else
|
|
{
|
|
last_char = *bufptr++ = *string++;
|
|
}
|
|
}
|
|
|
|
if( last_char > 0 )
|
|
{
|
|
word_count++;
|
|
}
|
|
|
|
*bufptr = '\0';
|
|
|
|
token_list = ( char ** ) hb_xgrab( sizeof( char * ) * ( word_count + 2 ) );
|
|
token_list[ 0 ] = buffer;
|
|
token_list++;
|
|
|
|
bufptr = buffer;
|
|
|
|
for(word_nbr = 0; word_nbr < word_count; word_nbr++)
|
|
{
|
|
token_list[ word_nbr ] = bufptr;
|
|
bufptr += strlen( bufptr ) + 1;
|
|
}
|
|
|
|
token_list[ word_count ] = NULL;
|
|
|
|
*iWord = word_count;
|
|
|
|
return token_list;
|
|
}
|
|
|
|
/*----------------------------------------------------------------------------*/
|
|
static HB_BOOL file_read( FILE *stream, char *string, int *iCharCount )
|
|
{
|
|
int ch, cnbr = 0;
|
|
|
|
memset( string, ' ', MAX_READ );
|
|
|
|
for( ;; )
|
|
{
|
|
ch = fgetc( stream );
|
|
|
|
if( ( ch == '\n' ) || ( ch == EOF ) || ( ch == 26 ) )
|
|
{
|
|
*iCharCount = cnbr;
|
|
string[ cnbr ] = '\0';
|
|
return ch == '\n' || cnbr;
|
|
}
|
|
else
|
|
{
|
|
if( cnbr < MAX_READ && ch != '\r' )
|
|
{
|
|
string[ cnbr++ ] = ( char ) ch;
|
|
}
|
|
}
|
|
|
|
if( cnbr >= MAX_READ )
|
|
{
|
|
*iCharCount = cnbr;
|
|
string[ MAX_READ ] = '\0';
|
|
return HB_TRUE;
|
|
}
|
|
}
|
|
}
|
|
|
|
/*----------------------------------------------------------------------------*/
|
|
HB_FUNC( FPARSE )
|
|
{
|
|
FILE *inFile ;
|
|
PHB_ITEM pSrc = hb_param( 1, HB_IT_STRING );
|
|
PHB_ITEM pDelim = hb_param( 2, HB_IT_STRING );
|
|
PHB_ITEM pArray;
|
|
PHB_ITEM pItem;
|
|
char *string ;
|
|
char **tokens;
|
|
int iToken, iCharCount = 0;
|
|
HB_BYTE nByte;
|
|
|
|
/* file parameter correctly passed */
|
|
if( !pSrc )
|
|
{
|
|
hb_reta( 0 );
|
|
return;
|
|
}
|
|
|
|
if( hb_itemGetCLen( pSrc ) == 0 )
|
|
{
|
|
hb_reta( 0 );
|
|
return;
|
|
}
|
|
|
|
/* open file for read */
|
|
inFile = hb_fopen( hb_itemGetCPtr( pSrc ), "r" );
|
|
|
|
/* return empty array on failure */
|
|
if( !inFile )
|
|
{
|
|
hb_reta( 0 );
|
|
return;
|
|
}
|
|
|
|
/* default delimiter to comma, chr(44) */
|
|
nByte = pDelim ? ( HB_BYTE ) hb_itemGetCPtr( pDelim )[ 0 ] : ( HB_BYTE ) 44;
|
|
|
|
/* the main array */
|
|
pArray = hb_itemArrayNew( 0 );
|
|
pItem = hb_itemNew( NULL );
|
|
|
|
/* book memory for line to read */
|
|
string = ( char * ) hb_xgrab( MAX_READ + 1 );
|
|
|
|
/* read the file until EOF */
|
|
while( file_read( inFile, string, &iCharCount ) )
|
|
{
|
|
/* parse the read line */
|
|
int iWord = 0;
|
|
|
|
tokens = hb_tokensplit( string, nByte, iCharCount, &iWord );
|
|
|
|
/* prepare empty array */
|
|
hb_arrayNew( pItem, iWord );
|
|
|
|
/* add parsed text to array */
|
|
for( iToken = 0; tokens[ iToken ]; iToken++ )
|
|
{
|
|
hb_arraySetC( pItem, iToken + 1, tokens[ iToken ] );
|
|
}
|
|
|
|
/* add array containing parsed text to main array */
|
|
hb_arrayAddForward( pArray, pItem );
|
|
|
|
/* clean up */
|
|
tokens--;
|
|
hb_xfree( tokens[ 0 ] );
|
|
hb_xfree( tokens );
|
|
}
|
|
|
|
/* return main array */
|
|
hb_itemReturnRelease( pArray );
|
|
hb_itemRelease( pItem );
|
|
|
|
/* clean up */
|
|
hb_xfree( string );
|
|
fclose( inFile );
|
|
}
|
|
|
|
/*----------------------------------------------------------------------------*/
|
|
HB_FUNC( FPARSEEX )
|
|
{
|
|
FILE *inFile ;
|
|
PHB_ITEM pSrc = hb_param( 1, HB_IT_STRING );
|
|
PHB_ITEM pDelim = hb_param( 2, HB_IT_STRING );
|
|
PHB_ITEM pArray;
|
|
PHB_ITEM pSubArray;
|
|
char *string;
|
|
int iCharCount = 0;
|
|
HB_BYTE nByte;
|
|
|
|
/* file parameter correctly passed */
|
|
if( !pSrc )
|
|
{
|
|
hb_reta( 0 );
|
|
return;
|
|
}
|
|
|
|
if( hb_itemGetCLen( pSrc ) == 0 )
|
|
{
|
|
hb_reta( 0 );
|
|
return;
|
|
}
|
|
|
|
/* open file for read */
|
|
inFile = hb_fopen( hb_itemGetCPtr( pSrc ), "r" );
|
|
|
|
/* return empty array on failure */
|
|
if( !inFile )
|
|
{
|
|
hb_reta( 0 );
|
|
return;
|
|
}
|
|
|
|
/* default delimiter to comma, chr(44) */
|
|
nByte = pDelim ? ( HB_BYTE ) hb_itemGetCPtr( pDelim )[ 0 ] : ( HB_BYTE ) 44;
|
|
|
|
/* the main array */
|
|
pArray = hb_itemArrayNew( 0 );
|
|
pSubArray = hb_itemNew( NULL );
|
|
|
|
/* book memory for line to read */
|
|
string = ( char * ) hb_xgrab( MAX_READ + 1 );
|
|
|
|
/* read the file until EOF */
|
|
while( file_read( inFile, string, &iCharCount ) )
|
|
{
|
|
/* parse the read line */
|
|
int iWord = 0;
|
|
hb_arrayNew( pSubArray, 0 );
|
|
|
|
hb_ParseLine( pSubArray, string, nByte, &iWord );
|
|
|
|
/* add array containing parsed text to main array */
|
|
hb_arrayAddForward( pArray, pSubArray );
|
|
}
|
|
|
|
/* return main array */
|
|
hb_itemReturnRelease( pArray );
|
|
hb_itemRelease( pSubArray );
|
|
|
|
/* clean up */
|
|
hb_xfree( string );
|
|
fclose( inFile );
|
|
}
|
|
|
|
/*----------------------------------------------------------------------------*/
|
|
HB_FUNC( FWORDCOUNT )
|
|
{
|
|
FILE *inFile ;
|
|
PHB_ITEM pSrc = hb_param( 1, HB_IT_STRING );
|
|
char *string ;
|
|
char **tokens;
|
|
int iCharCount = 0;
|
|
HB_BYTE nByte = ' ';
|
|
HB_ULONG ulWordCount = 0;
|
|
|
|
/* file parameter correctly passed */
|
|
if( !pSrc )
|
|
{
|
|
hb_retni( 0 );
|
|
return;
|
|
}
|
|
|
|
if( hb_itemGetCLen( pSrc ) == 0 )
|
|
{
|
|
hb_retni( 0 );
|
|
return;
|
|
}
|
|
|
|
/* open file for read */
|
|
inFile = hb_fopen( hb_itemGetCPtr( pSrc ), "r" );
|
|
|
|
/* return 0 on failure */
|
|
if( !inFile )
|
|
{
|
|
hb_retni( 0 );
|
|
return;
|
|
}
|
|
|
|
/* book memory for line to read */
|
|
string = ( char * ) hb_xgrab( MAX_READ + 1 );
|
|
|
|
/* read the file until EOF */
|
|
while( file_read( inFile, string, &iCharCount ) )
|
|
{
|
|
int iWord = 0;
|
|
|
|
tokens = hb_tokensplit( string, nByte, iCharCount, &iWord );
|
|
|
|
ulWordCount += iWord;
|
|
|
|
/* clean up */
|
|
tokens--;
|
|
hb_xfree( tokens[ 0 ] );
|
|
hb_xfree( tokens );
|
|
}
|
|
|
|
/* return number of words */
|
|
hb_retnl( ulWordCount );
|
|
|
|
/* clean up */
|
|
hb_xfree( string );
|
|
fclose( inFile );
|
|
}
|
|
|
|
/*----------------------------------------------------------------------------*/
|
|
HB_FUNC( FLINECOUNT )
|
|
{
|
|
FILE *inFile ;
|
|
PHB_ITEM pSrc = hb_param( 1, HB_IT_STRING );
|
|
HB_ULONG ulLineCount = 0;
|
|
int ch;
|
|
|
|
/* file parameter correctly passed */
|
|
if( !pSrc )
|
|
{
|
|
hb_retni( 0 );
|
|
return;
|
|
}
|
|
|
|
if( hb_itemGetCLen( pSrc ) == 0 )
|
|
{
|
|
hb_retni( 0 );
|
|
return;
|
|
}
|
|
|
|
/* open file for read */
|
|
inFile = hb_fopen( hb_itemGetCPtr( pSrc ), "r" );
|
|
|
|
/* return 0 on failure */
|
|
if( !inFile )
|
|
{
|
|
hb_retni( 0 );
|
|
return;
|
|
}
|
|
|
|
/* read the file until EOF */
|
|
while( ( ch = fgetc( inFile ) ) != EOF )
|
|
{
|
|
if( ch == '\n' )
|
|
{
|
|
ulLineCount++;
|
|
}
|
|
}
|
|
|
|
/* return number of lines */
|
|
hb_retnl( ulLineCount );
|
|
|
|
/* clean up */
|
|
fclose( inFile );
|
|
}
|
|
|
|
/*----------------------------------------------------------------------------*/
|
|
HB_FUNC( FCHARCOUNT )
|
|
{
|
|
FILE *inFile ;
|
|
PHB_ITEM pSrc = hb_param( 1, HB_IT_STRING );
|
|
HB_ULONG ulResult = 0;
|
|
int ch;
|
|
|
|
/* file parameter correctly passed */
|
|
if( !pSrc )
|
|
{
|
|
hb_retni( 0 );
|
|
return;
|
|
}
|
|
|
|
if( hb_itemGetCLen( pSrc ) == 0 )
|
|
{
|
|
hb_retni( 0 );
|
|
return;
|
|
}
|
|
|
|
/* open file for read */
|
|
inFile = hb_fopen( hb_itemGetCPtr( pSrc ), "r" );
|
|
|
|
/* return 0 on failure */
|
|
if( !inFile )
|
|
{
|
|
hb_retni( 0 );
|
|
return;
|
|
}
|
|
|
|
/* read the file until EOF */
|
|
while( ( ch = fgetc( inFile ) ) != EOF )
|
|
{
|
|
switch( ch )
|
|
{
|
|
case '\n' :
|
|
case '\r' :
|
|
case ' ' :
|
|
case '\t':
|
|
break;
|
|
default:
|
|
ulResult++;
|
|
}
|
|
}
|
|
|
|
/* return number of characters */
|
|
hb_retnl( ulResult );
|
|
|
|
/* clean up */
|
|
fclose( inFile );
|
|
}
|
|
|
|
/*----------------------------------------------------------------------------*/
|
|
HB_FUNC( FPARSELINE )
|
|
{
|
|
PHB_ITEM pArray;
|
|
int iWords = 0;
|
|
const char * szText;
|
|
|
|
pArray = hb_itemArrayNew( 0 );
|
|
szText = hb_parc( 1 );
|
|
|
|
if( szText )
|
|
{
|
|
const char * szDelim = hb_parc( 2 );
|
|
hb_ParseLine( pArray, szText, szDelim ? ( unsigned char ) *szDelim : ',', &iWords );
|
|
}
|
|
|
|
hb_itemReturnRelease( pArray );
|
|
hb_stornl( iWords, 3 );
|
|
}
|