diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3fc03de233..5119673894 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,59 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-10-28 01:52 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * include/Makefile + * include/hbextern.ch + + include/hbver.ch + * source/rtl/version.c + + Added HB_VERSION() unified version information + function. This can return these version related data: + hb_version( HB_V_HARBOUR ) => + hb_version( HB_V_COMPILER ) => + hb_version( HB_V_MAJOR ) => + hb_version( HB_V_MINOR ) => + hb_version( HB_V_REV ) => + hb_version( HB_V_STATUS ) => + hb_version( HB_V_COUNT ) => + hb_version( HB_V_DATE_TIME ) => + hb_version( HB_V_DATE ) => + hb_version( HB_V_TIME ) => + hb_version( HB_V_PCODE ) => + hb_version( HB_V_PCODE_STR ) => + hb_version( HB_V_CHANGELOG_LAST ) => + hb_version( HB_V_CHANGELOG_REV ) => + hb_version( HB_V_FLAG_HARBOUR ) => + hb_version( HB_V_FLAG_C ) => + hb_version( HB_V_FLAG_LINKER ) => + hb_version( HB_V_BITWIDTH ) => + hb_version( HB_V_ENDIANNESS ) => + This function makes deprecated following functions: + - HB_COMPILER() => hb_version( HB_V_COMPILER ) + - HB_PCODEVER() => hb_version( HB_V_PCODE_VER_STR ) + - HB_BUILDDATE() => hb_version( HB_V_DATE_TIME ) + and macros: + - __ARCH16BIT__ + - __ARCH32BIT__ + - __ARCH64BIT__ + - __LITTLE_ENDIAN__ + - __BIG_ENDIAN__ + - __PDP_ENDIAN__ + ; NOTE: If there are no objections, I'd remove the + __ARCH*BIT__ and __*ENDIAN__ predefined macros, + as these can be misleading on some systems. + ; TODO: Implement HB_V_DATE and HB_V_TIME. + ; TODO: Add HB_MTVM() functionality. + ; TODO: Add __PLATFORM__* equivalent. + ; TODO: Add HB_OS_UNIX_COMPATIBLE equivalent. + + * include/hbextern.ch + * include/hbapifs.h + * common.mak + * source/rtl/Makefile + + source/rtl/fscopy.c + + Added C level hb_fsCopy() function. + + Added .prg level HB_FCOPY() function. + 2008-10-28 00:57 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * include/hbextern.ch * source/vm/cmdarg.c diff --git a/harbour/common.mak b/harbour/common.mak index 63c0121c7f..271a1592b3 100644 --- a/harbour/common.mak +++ b/harbour/common.mak @@ -496,6 +496,7 @@ RTL_LIB_OBJS = \ $(OBJ_DIR)\filesys$(OBJEXT) \ $(OBJ_DIR)\fkmax$(OBJEXT) \ $(OBJ_DIR)\fnsplit$(OBJEXT) \ + $(OBJ_DIR)\fscopy$(OBJEXT) \ $(OBJ_DIR)\fserror$(OBJEXT) \ $(OBJ_DIR)\fssize$(OBJEXT) \ $(OBJ_DIR)\fstemp$(OBJEXT) \ diff --git a/harbour/include/Makefile b/harbour/include/Makefile index 004a50a39f..d7aec81d85 100644 --- a/harbour/include/Makefile +++ b/harbour/include/Makefile @@ -96,6 +96,7 @@ PRG_HEADERS=\ hbstdgen.ch \ hbthread.ch \ hbusrrdd.ch \ + hbver.ch \ hbzlib.ch \ inkey.ch \ memoedit.ch \ diff --git a/harbour/include/hbapifs.h b/harbour/include/hbapifs.h index 39f6da039c..5a83b12526 100644 --- a/harbour/include/hbapifs.h +++ b/harbour/include/hbapifs.h @@ -208,6 +208,7 @@ extern HB_EXPORT void hb_fsSetFError ( USHORT uiError ); /* set FERROR() extern HB_EXPORT BOOL hb_fsNameExists ( const char * pszFileName ); /* check if a name exists in the filesystem (wildcard chars not accepted). */ extern HB_EXPORT BOOL hb_fsFileExists ( const char * pszFileName ); /* check if a file exists (wildcard chars not accepted). */ extern HB_EXPORT BOOL hb_fsDirExists ( const char * pszDirName ); /* check if a directory exists (wildcard chars not accepted). */ +extern HB_EXPORT BOOL hb_fsCopy ( const BYTE * pSource, const BYTE * pDest ); #define hb_fsFLock( h, s, l ) hb_fsLock( h, s, l, FL_LOCK ) #define hb_fsFUnlock( h, s, l ) hb_fsLock( h, s, l, FL_UNLOCK ) diff --git a/harbour/include/hbextern.ch b/harbour/include/hbextern.ch index ac0f4301a5..4d97f977fc 100644 --- a/harbour/include/hbextern.ch +++ b/harbour/include/hbextern.ch @@ -795,15 +795,10 @@ EXTERNAL HB_ARGSTRING EXTERNAL HB_ARGV EXTERNAL HB_CMDLINE EXTERNAL HB_COLORINDEX +EXTERNAL HB_VERSION EXTERNAL HB_COMPILER EXTERNAL HB_PCODEVER EXTERNAL HB_BUILDDATE -EXTERNAL HB_FNAMEEXISTS -EXTERNAL HB_FILEEXISTS -EXTERNAL HB_DIREXISTS -EXTERNAL HB_FNAMEMERGE -EXTERNAL HB_FNAMESPLIT -EXTERNAL HB_DIRSCAN EXTERNAL HB_LANGNAME EXTERNAL HB_LANGSELECT EXTERNAL HB_LANGERRMSG @@ -1094,6 +1089,13 @@ EXTERNAL HB_FCOMMIT EXTERNAL HB_FLOCK EXTERNAL HB_FUNLOCK EXTERNAL HB_FTEMPCREATE +EXTERNAL HB_FCOPY +EXTERNAL HB_FILEEXISTS +EXTERNAL HB_DIREXISTS +EXTERNAL HB_FNAMEEXISTS +EXTERNAL HB_FNAMEMERGE +EXTERNAL HB_FNAMESPLIT +EXTERNAL HB_DIRSCAN EXTERNAL HB_GCALL EXTERNAL HB_KEYCLEAR EXTERNAL HB_KEYPUT diff --git a/harbour/include/hbver.ch b/harbour/include/hbver.ch new file mode 100644 index 0000000000..b6e7d5c4d5 --- /dev/null +++ b/harbour/include/hbver.ch @@ -0,0 +1,84 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * Header file for HB_VERSION() function + * + * Copyright 2008 Viktor Szakats + * 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. + * + */ + +/* NOTE: This file is also used by C code. */ + +#ifndef HB_VER_CH_ +#define HB_VER_CH_ + +/* hb_version() parameters. */ +#define HB_V_HARBOUR 0 /* default */ +#define HB_V_COMPILER 1 +#define HB_V_VER_MAJOR 2 +#define HB_V_VER_MINOR 3 +#define HB_V_VER_REV 4 +#define HB_V_VER_STATUS 5 +#define HB_V_VER_COUNT 6 +#define HB_V_DATE_TIME 7 +#define HB_V_DATE 8 +#define HB_V_TIME 9 +#define HB_V_PCODE_VER 10 +#define HB_V_PCODE_VER_STR 11 +#define HB_V_CHANGELOG_LAST 12 +#define HB_V_CHANGELOG_REV 13 +#define HB_V_FLAG_HARBOUR 14 +#define HB_V_FLAG_C 15 +#define HB_V_FLAG_LINKER 16 +#define HB_V_BITWIDTH 17 +#define HB_V_ENDIANNESS 18 + +/* hb_version( HB_V_ENDIANNESS ) return values. */ +#define HB_V_ENDIAN_LITTLE 1 +#define HB_V_ENDIAN_BIG 2 +#define HB_V_ENDIAN_PDP 3 + +#endif /* HB_VER_CH_ */ diff --git a/harbour/source/rtl/Makefile b/harbour/source/rtl/Makefile index 276c6654dd..1b0c7bf871 100644 --- a/harbour/source/rtl/Makefile +++ b/harbour/source/rtl/Makefile @@ -39,6 +39,7 @@ C_SOURCES=\ filesys.c \ fkmax.c \ fnsplit.c \ + fscopy.c \ fserror.c \ fssize.c \ fstemp.c \ diff --git a/harbour/source/rtl/fscopy.c b/harbour/source/rtl/fscopy.c new file mode 100644 index 0000000000..06727ea396 --- /dev/null +++ b/harbour/source/rtl/fscopy.c @@ -0,0 +1,109 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * hb_fsCopy(), HB_FCOPY() functions + * + * Copyright 1991-2008 Viktor Szakats + * 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. + * + */ + +#include "hbapi.h" +#include "hbapifs.h" + +#define HB_FSCOPY_BUFFERSIZE 16384 + +HB_EXPORT BOOL hb_fsCopy( const BYTE * pSource, const BYTE * pDest ) +{ + BOOL bRetVal = TRUE; + HB_FHANDLE fhndSource; + HB_FHANDLE fhndDest; + + if( ( fhndSource = hb_fsOpen( ( BYTE * ) pSource, FO_READ | FO_DENYNONE ) ) != FS_ERROR ) + { + if( ( fhndDest = hb_fsCreate( ( BYTE * ) pDest, FC_NORMAL ) ) != FS_ERROR ) + { + USHORT nBytesRead; + BYTE * pbyBuffer = ( BYTE * ) hb_xgrab( HB_FSCOPY_BUFFERSIZE ); + + while( ( nBytesRead = hb_fsRead( fhndSource, pbyBuffer, HB_FSCOPY_BUFFERSIZE ) ) > 0 ) + { + if( nBytesRead != hb_fsWrite( fhndDest, pbyBuffer, nBytesRead ) ) + { + bRetVal = FALSE; + break; + } + } + + hb_xfree( pbyBuffer ); + + hb_fsClose( fhndDest ); + } + else + bRetVal = FALSE; + + hb_fsClose( fhndSource ); + } + else + bRetVal = FALSE; + + return bRetVal; +} + +HB_FUNC( HB_FCOPY ) +{ + USHORT uiError = 2; + + if( ISCHAR( 1 ) && ISCHAR( 2 ) ) + { + hb_retni( hb_fsCopy( ( BYTE * ) hb_parc( 1 ), + ( BYTE * ) hb_parc( 2 ) ) ? 0 : F_ERROR ); + uiError = hb_fsError(); + } + else + hb_retni( F_ERROR ); + + hb_fsSetFError( uiError ); +} diff --git a/harbour/source/rtl/version.c b/harbour/source/rtl/version.c index e1017d9014..080bc78330 100644 --- a/harbour/source/rtl/version.c +++ b/harbour/source/rtl/version.c @@ -54,8 +54,8 @@ * The following parts are Copyright of the individual authors. * www - http://www.harbour-project.org * - * Copyright 1999-2001 Viktor Szakats - * HB_COMPILER() + * Copyright 1999-2008 Viktor Szakats + * HB_VERSION(), HB_COMPILER() * * See doc/license.txt for licensing terms. * @@ -63,21 +63,73 @@ #include "hbapi.h" +#include "hbver.ch" + HB_FUNC( OS ) { hb_retc_buffer( hb_verPlatform() ); } -HB_FUNC( HB_COMPILER ) -{ - hb_retc_buffer( hb_verCompiler() ); -} - HB_FUNC( VERSION ) { hb_retc_buffer( hb_verHarbour() ); } +HB_FUNC( HB_VERSION ) +{ + switch( hb_parni( 1 ) ) + { + case HB_V_HARBOUR: hb_retc_buffer( hb_verHarbour() ); break; + case HB_V_COMPILER: hb_retc_buffer( hb_verCompiler() ); break; + case HB_V_VER_MAJOR: hb_retni( HB_VER_MAJOR ); break; + case HB_V_VER_MINOR: hb_retni( HB_VER_MINOR ); break; + case HB_V_VER_REV: hb_retni( HB_VER_REVISION ); break; + case HB_V_VER_STATUS: hb_retc( HB_VER_STATUS ); break; + case HB_V_VER_COUNT: hb_retni( hb_verSvnID() ); break; + case HB_V_DATE_TIME: hb_retc_buffer( hb_verBuildDate() ); break; + case HB_V_DATE: hb_retds( NULL ); break; /* TODO */ + case HB_V_TIME: hb_retc( NULL ); break; /* TODO */ + case HB_V_PCODE_VER: hb_retni( HB_PCODE_VER ); break; + case HB_V_PCODE_VER_STR: hb_retc_buffer( hb_verPCode() ); break; + case HB_V_CHANGELOG_LAST: hb_retc_const( hb_verSvnLastEntry() ); break; + case HB_V_CHANGELOG_REV: hb_retc_const( hb_verSvnChangeLogID() ); break; + case HB_V_FLAG_HARBOUR: hb_retc_const( hb_verFlagsPRG() ); break; + case HB_V_FLAG_C: hb_retc_const( hb_verFlagsC() ); break; + case HB_V_FLAG_LINKER: hb_retc_const( hb_verFlagsL() ); break; + + case HB_V_BITWIDTH: + #if defined( HB_ARCH_16BIT ) + hb_retni( 16 ); + #elif defined( HB_ARCH_32BIT ) + hb_retni( 32 ); + #elif defined( HB_ARCH_64BIT ) + hb_retni( 64 ); + #else + hb_retni( 0 ); + #endif + break; + + case HB_V_ENDIANNESS: + #if defined( HB_LITTLE_ENDIAN ) + hb_retni( HB_V_ENDIAN_LITTLE ); + #elif defined( HB_BIG_ENDIAN ) + hb_retni( HB_V_ENDIAN_BIG ); + #elif defined( HB_PDP_ENDIAN ) + hb_retni( HB_V_ENDIAN_PDP ); + #else + hb_retni( 0 ); + #endif + break; + } +} + +/* Legacy functions */ + +HB_FUNC( HB_COMPILER ) +{ + hb_retc_buffer( hb_verCompiler() ); +} + HB_FUNC( HB_PCODEVER ) { hb_retc_buffer( hb_verPCode() );