From 93fa70f0e8ff6e0f53f8dfdbdbd930a58f3076f3 Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Sat, 1 Sep 2007 14:23:25 +0000
Subject: [PATCH] 2007-09-01 16:23 UTC+0200 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/include/hbcompat.ch     + added some new
 translation rules   * harbour/source/vm/proc.c     * fixed buffer size to
 protect against possible overflow

---
 harbour/ChangeLog           |  6 ++++++
 harbour/include/hbcompat.ch | 23 ++++++++++++++---------
 harbour/source/vm/proc.c    |  2 +-
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f8bf385522..ac296cf3d7 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,12 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-09-01 16:23 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/include/hbcompat.ch
+    + added some new translation rules
+  * harbour/source/vm/proc.c
+    * fixed buffer size to protect against possible overflow
+
 2007-09-01 14:38 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/rtl/hbhex.c
     * replaced TAB by spaces
diff --git a/harbour/include/hbcompat.ch b/harbour/include/hbcompat.ch
index 53e3116afa..0053c28307 100644
--- a/harbour/include/hbcompat.ch
+++ b/harbour/include/hbcompat.ch
@@ -69,6 +69,7 @@
 
    #xtranslate hb_isregex([<x>])       => hb_isregexstring(<x>)
    #xtranslate hb_pvalue([<x,...>])    => pvalue(<x>)
+   #xtranslate hb_methodName([<x,...>])=> methodName(<x>)
    #xtranslate hb_libLoad([<x,...>])   => libLoad(<x>)
    #xtranslate hb_libFree([<x,...>])   => libFree(<x>)
    #xtranslate hb_adler32([<x,...>])   => hb_checksum(<x>)
@@ -100,13 +101,24 @@
 
    #xtranslate hb_isregexstring([<x>]) => hb_isregex(<x>)
    #xtranslate pvalue([<x,...>])       => hb_pvalue(<x>)
+   #xtranslate methodName([<x,...>])   => hb_methodName(<x>)
    #xtranslate libLoad([<x,...>])      => hb_libLoad(<x>)
    #xtranslate libFree([<x,...>])      => hb_libFree(<x>)
    #xtranslate hb_checksum([<x,...>])  => hb_adler32(<x>)
    #xtranslate setLastKey([<x,...>])   => hb_setLastKey(<x>)
    #xtranslate CStr([<x,...>])         => hb_CStr(<x>)
 
+   #xtranslate HEXTONUM([<c,...>])     => HB_HEXTONUM(<c>)
+   #xtranslate NUMTOHEX([<n,...>])     => HB_NUMTOHEX(<n>)
+   #xtranslate HEXTOSTR([<c,...>])     => HB_HEXTOSTR(<c>)
+   #xtranslate STRTOHEX([<c,...>])     => HB_STRTOHEX(<c>)
+
+   #xtranslate RASCAN([<x,...>])       => HB_RASCAN(<x>)
+
+   #xtranslate ISPOINTER( <xValue> )   => HB_ISPOINTER( <xValue> )
+
    #xtranslate str(<x>,[<y>],[<y>],<z>)=> iif(<z>, ltrim(str(<x>)), str(<x>))
+   #xtranslate HB_CMDARGARGV([<x,...>])=> HB_ARGV(0)
 
    #xtranslate HASH([<x,...>])         => HB_HASH(<x>)
    #xtranslate HHASKEY([<x,...>])      => HB_HHASKEY(<x>)
@@ -134,15 +146,8 @@
    #xtranslate HALLOCATE([<x,...>])    => HB_HALLOCATE(<x>)
    #xtranslate HDEFAULT([<x,...>])     => HB_HDEFAULT(<x>)
 
-   #xtranslate HEXTONUM([<c,...>])     => HB_HEXTONUM(<c>)
-   #xtranslate NUMTOHEX([<n,...>])     => HB_NUMTOHEX(<n>)
-   #xtranslate HEXTOSTR([<c,...>])     => HB_HEXTOSTR(<c>)
-   #xtranslate STRTOHEX([<c,...>])     => HB_STRTOHEX(<c>)
-
-   #xtranslate RASCAN([<x,...>])       => HB_RASCAN(<x>)
-
-   #xtranslate ISPOINTER( <xValue> )   => HB_ISPOINTER( <xValue> )
-
+   /* THROW => generate error */
+   #xtranslate THROW(<oErr>) => (Eval(ErrorBlock(), <oErr>), Break(<oErr>))
 
    /* TEXT INTO <varname> */
    #xcommand TEXT INTO <v> => #pragma __text|<v>+=%s+HB_OSNEWLINE();<v>:=""
diff --git a/harbour/source/vm/proc.c b/harbour/source/vm/proc.c
index 41f46eb302..8a1f784ac2 100644
--- a/harbour/source/vm/proc.c
+++ b/harbour/source/vm/proc.c
@@ -77,7 +77,7 @@
 
 HB_FUNC( HB_METHODNAME )
 {
-   char szName[ HB_SYMBOL_NAME_LEN + HB_SYMBOL_NAME_LEN + 2 ];
+   char szName[ HB_SYMBOL_NAME_LEN + HB_SYMBOL_NAME_LEN + 5 ];
 
    hb_retc( hb_procname( hb_parni( 1 ) + 1, szName, TRUE ) );
 }