From 42b9b1e0ed1b6e5e2dde653b7c6e5693bd85b875 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Tue, 18 Jan 2011 15:32:14 +0000 Subject: [PATCH] 2011-01-18 16:32 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/contrib/hbfship/exec.c ! fixed to work with non *nix platforms + harbour/contrib/hbfship/index.c * harbour/contrib/hbfship/hbfship.hbp + added new FlagShip compatible functions: INDEXCOUNT() -> INDEXNAMES() -> --- harbour/ChangeLog | 10 +++ harbour/contrib/hbfship/exec.c | 18 ++++- harbour/contrib/hbfship/hbfship.hbp | 1 + harbour/contrib/hbfship/index.c | 107 ++++++++++++++++++++++++++++ 4 files changed, 134 insertions(+), 2 deletions(-) create mode 100644 harbour/contrib/hbfship/index.c diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b15ce8c054..7d55c95925 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,16 @@ The license applies to all entries newer than 2009-04-28. */ +2011-01-18 16:32 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/contrib/hbfship/exec.c + ! fixed to work with non *nix platforms + + + harbour/contrib/hbfship/index.c + * harbour/contrib/hbfship/hbfship.hbp + + added new FlagShip compatible functions: + INDEXCOUNT() -> + INDEXNAMES() -> + 2011-01-18 14:58 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + harbour/contrib/hbfship/exec.c * harbour/contrib/hbfship/hbfship.hbp diff --git a/harbour/contrib/hbfship/exec.c b/harbour/contrib/hbfship/exec.c index e8ded53c9a..f17e1943de 100644 --- a/harbour/contrib/hbfship/exec.c +++ b/harbour/contrib/hbfship/exec.c @@ -55,8 +55,14 @@ #include "hbapi.h" #include "hbapifs.h" -#include -#include +#if defined( HB_OS_UNIX ) || defined( __DJGPP__ ) +# include +# include +#elif defined( HB_OS_WIN ) +# include +#elif defined( HB_OS_OS2 ) || defined( HB_OS_DOS ) +# include +#endif HB_FUNC( EXECNAME ) { @@ -88,5 +94,13 @@ HB_FUNC( EXECNAME ) HB_FUNC( EXECPIDNUM ) { +#if defined( HB_OS_WIN_CE ) + hb_retni( 0 ); +#elif defined( HB_OS_WIN ) + hb_retnint( GetCurrentProcessId() ); +#elif ( defined( HB_OS_OS2 ) && defined( __GNUC__ ) ) + hb_retnint( _getpid() ); +#else hb_retnint( getpid() ); +#endif } diff --git a/harbour/contrib/hbfship/hbfship.hbp b/harbour/contrib/hbfship/hbfship.hbp index 4a36365815..6ba7bd68ca 100644 --- a/harbour/contrib/hbfship/hbfship.hbp +++ b/harbour/contrib/hbfship/hbfship.hbp @@ -14,6 +14,7 @@ isdb.prg exec.c flddeci.c +index.c isbegseq.c isfunc.c secondfs.c diff --git a/harbour/contrib/hbfship/index.c b/harbour/contrib/hbfship/index.c new file mode 100644 index 0000000000..5788a0575f --- /dev/null +++ b/harbour/contrib/hbfship/index.c @@ -0,0 +1,107 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * INDEXCOUNT() -> + * INDEXNAMES() -> + * FlagShip compatible functions + * + * Copyright 2011 Przemyslaw Czerpak + * 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. + * + */ + +#include "hbapi.h" +#include "hbapiitm.h" +#include "hbapirdd.h" + +HB_FUNC( INDEXCOUNT ) +{ + AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer(); + + if( pArea ) + { + DBORDERINFO pOrderInfo; + memset( &pOrderInfo, 0, sizeof( pOrderInfo ) ); + pOrderInfo.itmResult = hb_itemPutNI( NULL, 0 ); + SELF_ORDINFO( pArea, DBOI_ORDERCOUNT, &pOrderInfo ); + hb_itemReturnRelease( pOrderInfo.itmResult ); + } + else + hb_retni( 0 ); +} + +HB_FUNC( INDEXNAMES ) +{ + AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer(); + + if( pArea ) + { + DBORDERINFO pOrderInfo; + PHB_ITEM pArray; + int iSize, i; + + memset( &pOrderInfo, 0, sizeof( pOrderInfo ) ); + pOrderInfo.itmResult = hb_itemPutNI( NULL, 0 ); + SELF_ORDINFO( pArea, DBOI_ORDERCOUNT, &pOrderInfo ); + iSize = hb_itemGetNI( pOrderInfo.itmResult ); + + pArray = pOrderInfo.itmResult; + + pArray = hb_itemArrayNew( iSize ); + for( i = 1; i <= iSize; ++i ) + { + pOrderInfo.itmOrder = hb_itemPutNI( pOrderInfo.itmOrder, i ); + pOrderInfo.itmResult = hb_itemPutC( pOrderInfo.itmResult, 0 ); + if( SELF_ORDINFO( pArea, DBOI_NAME, &pOrderInfo ) != HB_SUCCESS ) + break; + hb_arraySet( pArray, i, pOrderInfo.itmResult ); + } + hb_itemRelease( pOrderInfo.itmOrder ); + hb_itemRelease( pOrderInfo.itmResult ); + hb_itemReturnRelease( pArray ); + } + else + hb_reta( 0 ); +}