From 4be2b3ea737421506aa1c05a6291505faeb5bad9 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Mon, 22 Sep 2008 02:27:54 +0000 Subject: [PATCH] 2008-09-22 04:27 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/rtl/hbinet.c ! fixed typo in previous commit which broke MS-Win builds * check hb_vmReaquestQuery() after executing use codeblocks --- harbour/ChangeLog | 5 +++++ harbour/source/rtl/hbinet.c | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e05456c7d4..7d4d90dea3 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,11 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-09-22 04:27 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/source/rtl/hbinet.c + ! fixed typo in previous commit which broke MS-Win builds + * check hb_vmReaquestQuery() after executing use codeblocks + 2008-09-22 03:49 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbstack.h * harbour/source/vm/estack.c diff --git a/harbour/source/rtl/hbinet.c b/harbour/source/rtl/hbinet.c index cf1b874358..2b3471be3c 100644 --- a/harbour/source/rtl/hbinet.c +++ b/harbour/source/rtl/hbinet.c @@ -320,7 +320,7 @@ static int hb_selectWriteExceptSocket( HB_SOCKET_STRUCT *Socket ) if( Socket->timeout == -1 ) { - iResult = select( Socket->com + 1, NULL, &set, &eset, NULL ) < 0 ) + iResult = select( Socket->com + 1, NULL, &set, &eset, NULL ); } else { @@ -965,7 +965,8 @@ static void s_inetRecvInternal( int iMode ) hb_execFromArray( Socket->caPeriodic ); /* do we continue? */ - if( ! hb_parl( -1 ) || ( Socket->timelimit != -1 && iTimeElapsed >= Socket->timelimit ) ) + if( ! hb_parl( -1 ) || hb_vmRequestQuery() != 0 || + ( Socket->timelimit != -1 && iTimeElapsed >= Socket->timelimit ) ) { HB_SOCKET_SET_ERROR2( Socket, -1, "Timeout" ); hb_retni( iReceived ); @@ -1088,7 +1089,7 @@ static void s_inetRecvPattern( const char *szPattern ) hb_vmLock(); hb_execFromArray( Socket->caPeriodic ); - fResult = hb_parl( -1 ); + fResult = hb_parl( -1 ) && hb_vmRequestQuery() == 0; hb_vmUnlock(); /* do we continue? */ @@ -1285,7 +1286,7 @@ HB_FUNC( HB_INETRECVENDBLOCK ) hb_vmLock(); hb_execFromArray( Socket->caPeriodic ); - fResult = hb_parl( -1 ); + fResult = hb_parl( -1 ) && hb_vmRequestQuery() == 0; hb_vmUnlock(); if( fResult && @@ -2145,7 +2146,7 @@ HB_FUNC( HB_INETDGRAMRECV ) hb_vmLock(); hb_execFromArray( Socket->caPeriodic ); /* do we continue? */ - fRepeat = hb_parl( -1 ) && + fRepeat = hb_parl( -1 ) && hb_vmRequestQuery() == 0 && ( Socket->timelimit == -1 || iTimeElapsed < Socket->timelimit ); hb_vmUnlock(); }