* harbour/contrib/libct/ctc.c
* harbour/contrib/libct/files.c
* harbour/contrib/libnf/ftattr.c
* harbour/contrib/libnf/n2color.c
* cleaned some BCC warnings
* harbour/include/hbapi.h
* harbour/include/hbexpra.c
* harbour/include/hbexprb.c
* harbour/include/hbsetup.ch
* harbour/source/common/expropt1.c
* harbour/source/common/expropt2.c
* harbour/source/common/hbver.c
* harbour/source/common/hbverdsp.c
* harbour/source/compiler/hbcomp.c
* harbour/source/vm/arrays.c
* harbour/source/vm/arrayshb.c
* harbour/source/vm/cmdarg.c
* harbour/source/vm/hvm.c
! fixed Harbour support for accessing string characters with array
index operators []
+ added support for #define HB_COMPAT_XHB - it's disabled by default.
When set it enables some of xHarbour features like negative array
indexes calculated from tail, accessing string characters with []
operators (warning it's not compatible with default Harbour version
enabled by -ks during compilation and //flags:s at runtime - in
xHarbour compatibility mode "ABC"[2] returns "B" when in Harbour 66)
and some other minor features.
* harbour/source/compiler/cmdcheck.c
* added support for optional setting C output type in -go switch
Now it accepts optional digit [0123] after -go in the same way
as -gc, f.e.: -go3
* harbour/source/compiler/harbour.c
* call hb_compExprLstDealloc() only when errors appeared during
compilation - it disable automatic freeing all allocated expressions
in clean compilation. I make it intentionally for easier detecting
problems one some expressions are not freed. So far the final cleanup
code always deallocated expressions what can hide some real bugs.
* harbour/source/vm/hvm.c
! fixed very serious bug in HVM closing. The s_uiActionRequest flag
was not cleared before hb_rddShutDown() so when RDD buffers were
hot and flushing required some PCODE evaluation (f.e. index KEY
or FOR expression) then they were not properly evaluated.
* harbour/source/vm/macro.c
* minor improvement
* harbour/utils/hbtest/rt_misc.prg
! fixed one of expected result, it was neither Harbour nor Clipper
result (I've just made some test with Clipper), I do not know why
it existed
395 lines
10 KiB
C
395 lines
10 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* Command line and environment argument management
|
|
*
|
|
* Copyright 1999-2001 Viktor Szakats <viktor.szakats@syenar.hu>
|
|
* 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_OS_WIN_32_USED
|
|
|
|
#include "hbvmopt.h"
|
|
#include "hbapi.h"
|
|
#include "hbapiitm.h"
|
|
#include "hbvm.h"
|
|
#include "hbmemory.ch"
|
|
#include "hbstack.h"
|
|
|
|
/* Command line argument management */
|
|
static int s_argc = 0;
|
|
static char ** s_argv = NULL;
|
|
|
|
#if defined( HB_OS_WIN_32 ) && defined( HB_OS_WIN_32_USED )
|
|
|
|
HB_EXTERN_BEGIN
|
|
|
|
HANDLE hb_hInstance = 0;
|
|
HANDLE hb_hPrevInstance = 0;
|
|
int s_iCmdShow = 0;
|
|
BOOL s_WinMainParam = FALSE;
|
|
|
|
HB_EXTERN_END
|
|
|
|
HB_EXPORT void hb_winmainArgInit( HANDLE hInstance, HANDLE hPrevInstance, int iCmdShow )
|
|
{
|
|
hb_hInstance = hInstance;
|
|
hb_hPrevInstance = hPrevInstance;
|
|
s_iCmdShow = iCmdShow;
|
|
s_WinMainParam = TRUE;
|
|
}
|
|
|
|
HB_EXPORT BOOL hb_winmainArgGet( HANDLE * phInstance, HANDLE * phPrevInstance, int * piCmdShow )
|
|
{
|
|
if( phInstance )
|
|
*phInstance = hb_hInstance;
|
|
if( phPrevInstance )
|
|
*phPrevInstance = hb_hPrevInstance;
|
|
if( piCmdShow )
|
|
*piCmdShow = s_iCmdShow;
|
|
|
|
return s_WinMainParam;
|
|
}
|
|
|
|
#endif
|
|
|
|
HB_EXPORT void hb_cmdargInit( int argc, char * argv[] )
|
|
{
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_cmdargInit(%d, %p)", argc, argv));
|
|
|
|
s_argc = argc;
|
|
s_argv = argv;
|
|
}
|
|
|
|
int hb_cmdargARGC( void )
|
|
{
|
|
return s_argc;
|
|
}
|
|
|
|
char ** hb_cmdargARGV( void )
|
|
{
|
|
return s_argv;
|
|
}
|
|
|
|
BOOL hb_cmdargIsInternal( const char * szArg )
|
|
{
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_cmdargIsInternal(%s)", szArg));
|
|
|
|
return strlen( szArg ) >= 2 &&
|
|
szArg[ 0 ] == '/' &&
|
|
szArg[ 1 ] == '/';
|
|
}
|
|
|
|
static char * hb_cmdargGet( const char * pszName, BOOL bRetValue )
|
|
{
|
|
char * pszRetVal = NULL, * pszEnvVar;
|
|
int i;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_cmdargGet(%s, %d)", pszName, (int) bRetValue));
|
|
|
|
/* Check the command line first */
|
|
|
|
for( i = 1; i < s_argc; i++ )
|
|
{
|
|
if( hb_cmdargIsInternal( s_argv[ i ] ) &&
|
|
hb_strnicmp( s_argv[ i ] + 2, pszName, strlen( pszName ) ) == 0 )
|
|
{
|
|
if( bRetValue )
|
|
{
|
|
char * pszPos = s_argv[ i ] + 2 + strlen( pszName );
|
|
|
|
if( *pszPos == ':' )
|
|
pszPos++;
|
|
|
|
return hb_strdup( pszPos );
|
|
}
|
|
else
|
|
return "";
|
|
}
|
|
}
|
|
|
|
/* Check the environment variable */
|
|
pszEnvVar = hb_getenv( "HARBOUR" );
|
|
if( !pszEnvVar || pszEnvVar[ 0 ] == '\0' )
|
|
{
|
|
if( pszEnvVar )
|
|
hb_xfree( ( void * ) pszEnvVar );
|
|
|
|
pszEnvVar = hb_getenv( "CLIPPER" );
|
|
}
|
|
|
|
if( pszEnvVar && pszEnvVar[ 0 ] != '\0' )
|
|
{
|
|
char * pszNext = pszEnvVar;
|
|
|
|
/* Step through all envvar switches. */
|
|
|
|
/* NOTE: CA-Clipper doesn't need the switches to be separated by any
|
|
chars at all, Harbour is more strict/standard in this respect,
|
|
it requires the switches to be separated. */
|
|
|
|
i = strlen( pszName );
|
|
while( *pszNext )
|
|
{
|
|
static const char * szSeparator = " ;,\t";
|
|
char * pszEnd;
|
|
|
|
/* Skip the separators */
|
|
while( *pszNext && strchr( szSeparator, *pszNext ) )
|
|
pszNext++;
|
|
|
|
/* The // is optional in the envvar */
|
|
if( hb_cmdargIsInternal( pszNext ) )
|
|
pszNext += 2;
|
|
|
|
pszEnd = pszNext;
|
|
/* Search for the end of this switch */
|
|
while( *pszEnd && strchr( szSeparator, *pszEnd ) == NULL )
|
|
pszEnd++;
|
|
|
|
/* Check the switch */
|
|
if( hb_strnicmp( pszNext, pszName, i ) == 0 )
|
|
{
|
|
if( bRetValue )
|
|
{
|
|
ULONG ulLen;
|
|
pszNext += i;
|
|
|
|
/* Skip value separator colon. */
|
|
if( *pszNext == ':' )
|
|
pszNext++;
|
|
|
|
ulLen = pszEnd > pszNext ? pszEnd - pszNext : 0;
|
|
pszRetVal = ( char * ) hb_xgrab( ulLen + 1 );
|
|
strncpy( pszRetVal, pszNext, ulLen );
|
|
pszRetVal[ ulLen ] = '\0';
|
|
}
|
|
else
|
|
pszRetVal = "";
|
|
break;
|
|
}
|
|
|
|
/* Step to the next switch */
|
|
pszNext = pszEnd;
|
|
}
|
|
}
|
|
|
|
if( pszEnvVar )
|
|
hb_xfree( ( void * ) pszEnvVar );
|
|
|
|
return pszRetVal;
|
|
}
|
|
|
|
BOOL hb_cmdargCheck( const char * pszName )
|
|
{
|
|
return hb_cmdargGet( pszName, FALSE ) != NULL;
|
|
}
|
|
|
|
/* NOTE: Pointer must be freed with hb_xfree() if not NULL */
|
|
|
|
char * hb_cmdargString( const char * pszName )
|
|
{
|
|
return hb_cmdargGet( pszName, TRUE );
|
|
}
|
|
|
|
int hb_cmdargNum( const char * pszName )
|
|
{
|
|
char * pszValue;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_cmdargNum(%s)", pszName));
|
|
|
|
pszValue = hb_cmdargGet( pszName, TRUE );
|
|
if( pszValue )
|
|
{
|
|
int iValue = atoi( pszValue );
|
|
|
|
hb_xfree( pszValue );
|
|
|
|
return iValue;
|
|
}
|
|
else
|
|
return -1;
|
|
}
|
|
|
|
/* Check if an internal switch has been set */
|
|
|
|
HB_FUNC( HB_ARGCHECK )
|
|
{
|
|
hb_retl( ISCHAR( 1 ) ? hb_cmdargCheck( hb_parc( 1 ) ) : FALSE );
|
|
}
|
|
|
|
/* Returns the value of an internal switch */
|
|
|
|
HB_FUNC( HB_ARGSTRING )
|
|
{
|
|
if( ISCHAR( 1 ) )
|
|
{
|
|
char * pszValue = hb_cmdargString( hb_parc( 1 ) );
|
|
|
|
if( pszValue )
|
|
{
|
|
hb_retc( pszValue );
|
|
hb_xfree( pszValue );
|
|
}
|
|
}
|
|
else
|
|
hb_retc( NULL );
|
|
}
|
|
|
|
/* Returns the number of command line arguments passed to the application, this
|
|
also includes the internal arguments. */
|
|
|
|
HB_FUNC( HB_ARGC )
|
|
{
|
|
hb_retni( s_argc - 1 );
|
|
}
|
|
|
|
/* Returns a command line argument passed to the application. Calling it with
|
|
the parameter zero, it will return the name of the executable, as written
|
|
in the command line. */
|
|
|
|
HB_FUNC( HB_ARGV )
|
|
{
|
|
if( ISNUM( 1 ) )
|
|
{
|
|
int argc = hb_parni( 1 );
|
|
|
|
hb_retc( ( argc >= 0 && argc < s_argc ) ? s_argv[ argc ] : "" );
|
|
}
|
|
else
|
|
hb_retc( NULL );
|
|
}
|
|
|
|
/* Check for command line internal arguments */
|
|
ULONG hb_cmdargProcessVM( int *pCancelKey, int *pCancelKeyEx )
|
|
{
|
|
char * cFlags;
|
|
ULONG ulFlags = HB_VMFLAG_HARBOUR;
|
|
|
|
#if defined( HB_COMPAT_XHB )
|
|
ulFlags |= HB_VMFLAG_ARRSTR;
|
|
#endif
|
|
|
|
if( hb_cmdargCheck( "INFO" ) )
|
|
{
|
|
{
|
|
char * pszVersion = hb_verHarbour();
|
|
hb_conOutErr( pszVersion, 0 );
|
|
hb_conOutErr( hb_conNewLine(), 0 );
|
|
hb_xfree( pszVersion );
|
|
}
|
|
|
|
{
|
|
char * pszVersion = hb_verPlatform();
|
|
hb_conOutErr( pszVersion, 0 );
|
|
hb_conOutErr( hb_conNewLine(), 0 );
|
|
hb_xfree( pszVersion );
|
|
}
|
|
|
|
{
|
|
char buffer[ 128 ];
|
|
/* snprintf( buffer, sizeof( buffer ), "DS avail=%luKB OS avail=%luKB EMM avail=%luKB", hb_xquery( HB_MEM_BLOCK ), hb_xquery( HB_MEM_VM ), hb_xquery( HB_MEM_EMS ) ); */
|
|
snprintf( buffer, sizeof( buffer ), "DS avail=%luKB OS avail=%luKB EMM avail=%luKB MemStat:%s", hb_xquery( HB_MEM_BLOCK ), hb_xquery( HB_MEM_VM ), hb_xquery( HB_MEM_EMS ), hb_xquery( HB_MEM_USEDMAX ) ? "On" : "Off" );
|
|
hb_conOutErr( buffer, 0 );
|
|
hb_conOutErr( hb_conNewLine(), 0 );
|
|
}
|
|
}
|
|
|
|
if( hb_cmdargCheck( "BUILD" ) )
|
|
hb_verBuildInfo();
|
|
|
|
if( (cFlags = hb_cmdargString( "FLAGS" )) != NULL )
|
|
{
|
|
int i = 0;
|
|
while( cFlags[ i ] )
|
|
{
|
|
switch( cFlags[ i++ ] )
|
|
{
|
|
case 'c':
|
|
/* clear all flags - minimal set of features */
|
|
ulFlags = 0;
|
|
break;
|
|
|
|
case 'h':
|
|
/* default Harbour mode */
|
|
ulFlags |= HB_VMFLAG_HARBOUR;
|
|
break;
|
|
/*
|
|
case 'x':
|
|
ulFlags |= HB_VMFLAG_XBASE;
|
|
break;
|
|
|
|
case 'r':
|
|
ulFlags |= HB_VMFLAG_RT_MACRO;
|
|
break;
|
|
*/
|
|
case 's':
|
|
ulFlags |= HB_VMFLAG_ARRSTR;
|
|
break;
|
|
}
|
|
}
|
|
hb_xfree( cFlags );
|
|
}
|
|
|
|
if( (cFlags=hb_cmdargString( "CANCEL" )) != NULL )
|
|
{
|
|
int iVal = atoi( cFlags );
|
|
if( iVal )
|
|
*pCancelKey = iVal;
|
|
hb_xfree( cFlags );
|
|
}
|
|
|
|
if( (cFlags=hb_cmdargString( "CANCELEX" )) != NULL )
|
|
{
|
|
int iVal = atoi( cFlags );
|
|
if( iVal )
|
|
*pCancelKeyEx = iVal;
|
|
hb_xfree( cFlags );
|
|
}
|
|
|
|
return ulFlags;
|
|
}
|