fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2012-04-05 16:13 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* harbour/include/hbapifs.h
  * harbour/src/common/hbffind.c
    ! fixed potential freeing uninitialized handlers on some platforms
    * hide private members 

  * harbour/src/codepage/Makefile
  * harbour/include/hbcpage.hbx
  + harbour/src/codepage/cp950.c
  + harbour/src/codepage/cp_950.c
    + added new Harbour codepage "CP950". It's similar to BIG5 and
      used by MS-Windows. Please test and inform me if you can replace
      BIG5 in your applications with CP950 without any problems.

  * harbour/contrib/hbnf/hbnf.hbx
    + added FT_IDLE()
This commit is contained in:
Przemyslaw Czerpak
2012-04-05 14:13:51 +00:00
parent 09f20ca825
commit 629db6e812
8 changed files with 5045 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
harbour/ChangeLog
View File

@@ -16,6 +16,23 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-04-05 16:13 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* harbour/include/hbapifs.h
* harbour/src/common/hbffind.c
! fixed potential freeing uninitialized handlers on some platforms
* hide private members
* harbour/src/codepage/Makefile
* harbour/include/hbcpage.hbx
+ harbour/src/codepage/cp950.c
+ harbour/src/codepage/cp_950.c
+ added new Harbour codepage "CP950". It's similar to BIG5 and
used by MS-Windows. Please test and inform me if you can replace
BIG5 in your applications with CP950 without any problems.
* harbour/contrib/hbnf/hbnf.hbx
+ added FT_IDLE()
2012-04-04 22:43 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* harbour/src/rtl/hbsocket.c
! fixed problems with missing error setting in select() executed

1
harbour/contrib/hbnf/hbnf.hbx
View File

@@ -111,6 +111,7 @@ DYNAMIC FT_GETVCUR
DYNAMIC FT_GETVPG
DYNAMIC FT_HEX2DEC
DYNAMIC FT_IAMIDLE
DYNAMIC FT_IDLE
DYNAMIC FT_INT86
DYNAMIC FT_INVCLR
DYNAMIC FT_ISBIT

4
harbour/include/hbapifs.h
View File

@@ -257,14 +257,14 @@ typedef struct
HB_FATTR attr;
HB_FOFFSET size;
#if defined( _HB_FFIND_INTERNAL_ )
/* Private */
const char * pszFileMask;
HB_FATTR attrmask;
HB_BOOL bFirst;
void * info; /* Pointer to the platform specific find info */
#endif
} HB_FFIND, * PHB_FFIND;
/* File Find API functions */

1
harbour/include/hbcpage.hbx
View File

@@ -12,6 +12,7 @@
// HB_FUNC_INCLUDE HB_CODEPAGE_*
// HB_FUNC_EXCLUDE HB_CODEPAGE_BIG5
// HB_FUNC_EXCLUDE HB_CODEPAGE_CP950
/* -------------------------------------------------------------------- */
/* WARNING: Automatically generated code below. DO NOT EDIT! */

1
harbour/src/codepage/Makefile
View File

@@ -5,6 +5,7 @@
ROOT := ../../
C_SOURCES := \
cp_950.c \
cp_big5.c \
cp_utf8.c \
cp_u16le.c \

4815
harbour/src/codepage/cp950.c Normal file
View File

File diff suppressed because it is too large Load Diff

189
harbour/src/codepage/cp_950.c Normal file
View File

@@ -0,0 +1,189 @@
/*
* $Id$
*/
/*
* Harbour Project source code:
* example of Harbour codepage using CP950 encoding
*
* Copyright 2011 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
* 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 "hbapicdp.h"
#include "cp950.c"
static HB_CDP_GET_FUNC( CP950_get )
{
*wc = 0;
if( *pnIndex < nLen )
{
HB_UCHAR uc = pSrc[ ( * pnIndex )++ ];
if( uc >= ( HB_CP950_FIRST >> 8 ) && uc <= ( HB_CP950_LAST >> 8 ) &&
*pnIndex < nLen )
{
*wc = s_cp950_to_ucs16( ( ( int ) uc << 8 ) | ( HB_UCHAR ) pSrc[ * pnIndex ] );
if( *wc )
{
( * pnIndex )++;
return HB_TRUE;
}
}
*wc = cdp->uniTable->uniCodes[ uc ];
if( *wc == 0 )
*wc = uc;
return HB_TRUE;
}
return HB_FALSE;
}
static HB_CDP_PUT_FUNC( CP950_put )
{
if( * pnIndex < nLen )
{
HB_USHORT b5 = s_ucs16_to_cp950( wc );
if( b5 )
{
if( * pnIndex + 1 < nLen )
{
HB_PUT_BE_UINT16( &pDst[ ( * pnIndex ) ], b5 );
* pnIndex += 2;
return HB_TRUE;
}
}
else
{
if( cdp->uniTable->uniTrans == NULL )
hb_cdpBuildTransTable( cdp->uniTable );
if( wc <= cdp->uniTable->wcMax &&
cdp->uniTable->uniTrans[ wc ] )
pDst[ ( * pnIndex )++ ] = cdp->uniTable->uniTrans[ wc ];
else
pDst[ ( * pnIndex )++ ] = wc >= 0x100 ? '?' : ( HB_UCHAR ) wc;
return HB_TRUE;
}
}
return HB_FALSE;
}
static HB_CDP_LEN_FUNC( CP950_len )
{
HB_USHORT b5 = s_ucs16_to_cp950( wc );
HB_SYMBOL_UNUSED( cdp );
return b5 ? 2 : 1;
}
static void hb_cp_init( PHB_CODEPAGE cdp )
{
HB_UCHAR * flags, * upper, * lower;
int i;
cdp->buffer = ( HB_UCHAR * ) hb_xgrab( 0x300 );
cdp->flags = flags = ( HB_UCHAR * ) cdp->buffer;
cdp->upper = upper = ( HB_UCHAR * ) cdp->buffer + 0x100;
cdp->lower = lower = ( HB_UCHAR * ) cdp->buffer + 0x200;
for( i = 0; i < 0x100; ++i )
{
flags[ i ] = 0;
if( HB_ISDIGIT( i ) )
flags[ i ] |= HB_CDP_DIGIT;
if( HB_ISALPHA( i ) )
flags[ i ] |= HB_CDP_ALPHA;
if( HB_ISUPPER( i ) )
flags[ i ] |= HB_CDP_UPPER;
if( HB_ISLOWER( i ) )
flags[ i ] |= HB_CDP_LOWER;
upper[ i ] = ( HB_UCHAR ) HB_TOUPPER( i );
lower[ i ] = ( HB_UCHAR ) HB_TOLOWER( i );
}
#if 0
for( i = 0; i < 0x10000; ++i )
{
HB_WCHAR wc = s_cp950_to_ucs16( i );
if( wc )
{
if( i != s_ucs16_to_cp950( wc ) )
{
printf( "irreversible translation: (CP950)%04X -> U+%04X -> (CP950)%04X\r\n",
i, wc, s_ucs16_to_cp950( wc ) );
fflush(stdout);
}
}
}
#endif
}
#define HB_CP_RAW
#define HB_CP_ID CP950
#define HB_CP_INFO "CP950"
#define HB_CP_UNITB HB_UNITB_437
#define HB_CP_GET_FUNC CP950_get
#define HB_CP_PUT_FUNC CP950_put
#define HB_CP_LEN_FUNC CP950_len
#define HB_CP_FLAGS_FUNC NULL
#define HB_CP_UPPER_FUNC NULL
#define HB_CP_LOWER_FUNC NULL
#define HB_CP_CMP_FUNC NULL
#define s_flags NULL
#define s_upper NULL
#define s_lower NULL
#define s_sort NULL
#define HB_CP_INIT hb_cp_init
/* include CP registration code */
#include "hbcdpreg.h"

51
harbour/src/common/hbffind.c
View File

@@ -56,6 +56,8 @@
# define _LARGEFILE64_SOURCE 1
#endif
#define _HB_FFIND_INTERNAL_
#include "hbapi.h"
#include "hbapifs.h"
#include "hbvm.h"
@@ -892,60 +894,45 @@ void hb_fsFindClose( PHB_FFIND ffind )
{
PHB_FFIND_INFO info = ( PHB_FFIND_INFO ) ffind->info;
hb_vmUnlock();
if( ffind->bFirst )
{
hb_vmUnlock();
#if defined( HB_OS_DOS )
#if defined( __DJGPP__ ) || defined( __BORLANDC__ )
{
HB_SYMBOL_UNUSED( info );
}
#else
{
#if defined( __WATCOMC__ )
# if defined( __WATCOMC__ )
_dos_findclose( &info->entry );
#else
# elif !defined( __DJGPP__ ) && !defined( __BORLANDC__ )
findclose( &info->entry );
#endif
}
#endif
# endif
#elif defined( HB_OS_OS2 )
{
DosFindClose( info->hFindFile );
if( info->entry )
DosFreeMem( info->entry );
}
#elif defined( HB_OS_WIN )
if( info->hFindFile != INVALID_HANDLE_VALUE )
{
FindClose( info->hFindFile );
}
if( info->hFindFile != INVALID_HANDLE_VALUE )
FindClose( info->hFindFile );
#elif defined( HB_OS_UNIX )
if( info->dir )
{
closedir( info->dir );
}
if( info->dir )
closedir( info->dir );
#else
{
/* Intentionally do nothing */
int iTODO; /* TODO: for given platform */
HB_SYMBOL_UNUSED( info );
}
{
/* Intentionally do nothing */
int iTODO; /* TODO: for given platform */
}
#endif
hb_vmLock();
hb_vmLock();
}
hb_xfree( ffind->info );
hb_xfree( info );
}
hb_xfree( ffind );