From c45c3e42a0ee71b502d43e636280bd3097bfb022 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 13 Apr 2011 19:13:52 +0000 Subject: [PATCH] 2011-04-13 21:13 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg ! fixed RTE when using invalid GT name from cmdline ('hbmk2 test -gt.') --- harbour/ChangeLog | 6 +++++- harbour/utils/hbmk2/hbmk2.prg | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4045018017..5da6698e52 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,10 @@ The license applies to all entries newer than 2009-04-28. */ +2011-04-13 21:13 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + ! fixed RTE when using invalid GT name from cmdline ('hbmk2 test -gt.') + 2011-04-13 11:45 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbxbp/xbpparthandler.prg ! Changed: ::aOwned to ::_aOwned to suggest that this is internal. @@ -98,7 +102,7 @@ 2011-04-13 04:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * src/rtl/fstemp.c - ! hb_fsTempDir(): due to misplaced else branche it returned + ! hb_fsTempDir(): due to misplaced else branch it returned './' on *nix systems when temp dir ended with pathsep, for the same reason it return empty string instead of './' if temp dir could not be determined. diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 5ce6379a3a..5178c22573 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -2354,7 +2354,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) cParam := NIL ENDIF ENDIF - IF !( Lower( cParam ) == "gtnul" ) + IF ! Empty( cParam ) .AND. !( Lower( cParam ) == "gtnul" ) IF AScan( hbmk[ _HBMK_aLIBCOREGT ], {| tmp | Lower( tmp ) == Lower( cParam ) } ) == 0 .AND. ; AScan( hbmk[ _HBMK_aLIBUSERGT ], {| tmp | Lower( tmp ) == Lower( cParam ) } ) == 0 AAddNotEmpty( hbmk[ _HBMK_aLIBUSERGT ], PathSepToSelf( cParam ) )