* harbour/config/rules.cf
* harbour/config/bsd/gcc.cf
* harbour/config/darwin/gcc.cf
* harbour/config/dos/bcc16.cf
* harbour/config/dos/djgpp.cf
* harbour/config/dos/owatcom.cf
* harbour/config/dos/rsx32.cf
* harbour/config/dos/watcom.cf
* harbour/config/linux/gcc.cf
* harbour/config/os2/gcc.cf
* harbour/config/os2/icc.cf
* harbour/config/sunos/gcc.cf
* harbour/config/w32/bcc32.cf
* harbour/config/w32/gcc.cf
* harbour/config/w32/global.cf
* harbour/config/w32/icc.cf
* harbour/config/w32/mingw32.cf
* harbour/config/w32/msvc.cf
* harbour/config/w32/rsxnt.cf
* harbour/config/w32/watcom.cf
* use F macro extension to extract file name from given macros.
It simplified some rules and allow to use vpath and differ file
locations in GNU Makefiles
* moved the BCC16 excpetion for C_RULE from global rules.cf to
DOS bcc16.cf file
* use mainstd library in MinGW build
* harbour/include/hbapi.h
+ added two new functions: hb_winmainArgInit() and hb_winmainArgGet()
to set/retrieve WinMain() parameters.
+ added hb_strMatchWildExact()
* harbour/source/pp/ppcore.c
* initialized variable to avoid compiler warning
* harbour/source/rtl/console.c
* cleaned comment
* harbour/source/rtl/hbffind.c
! Fixed invalid handle error in Windows when file() fails
(fix borrowed from xHarbour)
* harbour/source/rtl/strmatch.c
+ added hb_strMatchWildExact()
+ added 3-rd parameter <lExact> to WildMatch() - when it's TRUE
WildMatch() will check if given pattern cover the whole string.
Without it it check if pattern is valid prefix only.
* harbour/source/rtl/gtcrs/gtcrs.c
* harbour/source/rtl/gtcrs/gtcrs.h
* harbour/source/rtl/gtsln/mousesln.c
* do not call Gpm_GetSnapshot() to avoid stupid message on stderr
generated from GPM library - I lost the the hope that it will be
fixed ;-)
* harbour/source/rtl/gtpca/gtpca.c
* use select() in *nixes for cursor position terminal feedback.
* harbour/source/rtl/gtwin/gtwin.c
* try to always allocate console when compiled without
HB_NO_ALLOC_CONSOLE. It allow to use GTWIN also in real windows
programs.
+ harbour/source/rtl/gtwvt/Makefile
+ harbour/source/rtl/gtwvt/gtwvt.c
+ harbour/source/rtl/gtwvt/gtwvt.h
+ added new GT driver GTWVT - the core of this driver it's Peter Ress
work in xHarbour. In Harbour GTWVT contains only pure GT code without
local to GTWVT xHarbour extensions and GTWVT contrib libraries.
This extensions can be added but later but I want to keep them
separated from the core GTWVT code and add them as upper level GT
which can inherit from GTWVT. Just like I've implemented CTWIN.
Please update non GNU make files and test this GT in Windows.
The programs which want to use GTWVT should be compiled as standard
Windows GUI programs. GTWVT replaces window console code.
if you add to your code:
proc GTSYS()
request HB_GT_WIN
request HB_GT_WVT
return
then the final binaries will be linked with both GT drivers and you
can switch between them using //gt[:]<name> switch. F.e.:
./my_prog //gtwin
or
./my_prog //gtwvt
this feature works in all platforms.
People who works in shell environment (*nixes, MSYS, DJGPP) and use
hb* scripts does not have to use GTSYS() in source code but can simply
use -gt<name> switch in hblnk and hbmk.
* harbour/source/rtl/gtxwc/gtxwc.c
* some minor cleanups and code formatting
* harbour/source/vm/Makefile
+ harbour/source/vm/mainstd/Makefile
* moved mainstd.c to separate mainstd library for MinGW32 build.
Unfortunately MinGW always link main() function if it locate
it in libraries and ignores WinMain() what effectively makes
impossible to create Windows GUI programs if we have main() in
VM library. People who are using MinGW and wants to create only
pure console programs should now include mainstd library to linked
library list.
* harbour/source/vm/cmdarg.c
* harbour/source/vm/mainwin.c
+ added two new functions: hb_winmainArgInit() and hb_winmainArgGet()
to set/retrieve WinMain() parameters.
407 lines
10 KiB
C
407 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 )
|
|
{
|
|
int i;
|
|
char * pszEnvVar;
|
|
char * tmp;
|
|
|
|
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 );
|
|
char * pszRetVal;
|
|
|
|
if( *pszPos == ':' )
|
|
pszPos++;
|
|
|
|
pszRetVal = ( char * ) hb_xgrab( strlen( pszPos ) + 1 );
|
|
strcpy( pszRetVal, pszPos );
|
|
|
|
return pszRetVal;
|
|
}
|
|
else
|
|
return s_argv[ i ] + 2;
|
|
}
|
|
}
|
|
|
|
/* Check the environment variable */
|
|
|
|
pszEnvVar = hb_getenv( "HARBOUR" );
|
|
|
|
if( !pszEnvVar || pszEnvVar[ 0 ] == '\0' )
|
|
{
|
|
if( pszEnvVar )
|
|
hb_xfree( ( void * ) pszEnvVar );
|
|
|
|
pszEnvVar = hb_getenv( "CLIPPER" );
|
|
}
|
|
|
|
tmp = pszEnvVar;
|
|
|
|
if( pszEnvVar && pszEnvVar[ 0 ] != '\0' )
|
|
{
|
|
char * pszNext;
|
|
|
|
/* 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. */
|
|
|
|
pszNext = pszEnvVar;
|
|
|
|
while( *pszNext )
|
|
{
|
|
static const char * szSeparator = " ;,\t";
|
|
char * pszEnd;
|
|
|
|
/* Search for the end of this switch */
|
|
while( *pszNext && strchr( szSeparator, *pszNext ) == NULL )
|
|
pszNext++;
|
|
|
|
pszEnd = pszNext;
|
|
|
|
/* Skip the separators after the switch */
|
|
while( *pszNext && strchr( szSeparator, *pszNext ) )
|
|
pszNext++;
|
|
|
|
/* Check the switch */
|
|
|
|
/* The // is optional in the envvar */
|
|
if( hb_cmdargIsInternal( pszEnvVar ) )
|
|
pszEnvVar += 2;
|
|
|
|
if( hb_strnicmp( pszEnvVar, pszName, strlen( pszName ) ) == 0 )
|
|
{
|
|
if( bRetValue )
|
|
{
|
|
char * pszPos = pszEnvVar + strlen( pszName );
|
|
char * pszRetVal;
|
|
|
|
ULONG ulLen; /* NOTE: Use this variable as a workaround for MSC 8 internal error. [vszakats] */
|
|
|
|
/* Skip value separator colon. */
|
|
if( *pszPos == ':' )
|
|
pszPos++;
|
|
|
|
ulLen = pszEnd - pszPos;
|
|
|
|
pszRetVal = ( char * ) hb_xgrab( ulLen + 1 );
|
|
strncpy( pszRetVal, pszPos, ulLen );
|
|
pszRetVal[ ulLen ] = '\0';
|
|
|
|
return pszRetVal;
|
|
}
|
|
else
|
|
return pszEnvVar;
|
|
}
|
|
|
|
/* Step to the next switch */
|
|
pszEnvVar = pszNext;
|
|
}
|
|
}
|
|
|
|
if( tmp )
|
|
hb_xfree( ( void * ) tmp );
|
|
|
|
return NULL;
|
|
}
|
|
|
|
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( 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 ];
|
|
/* sprintf( 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 ) ); */
|
|
sprintf( 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 = 1;
|
|
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;
|
|
}
|