2011-09-12 17:41 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

* harbour/src/rtl/filesys.c
  * harbour/src/rtl/hbproces.c
    ! use hb_fsOsError() instead of errno which can be overwritten by
      by hb_fsSetIOError()

  * harbour/tests/gtxfnt.prg
    % hb_processRun() instead of hb_processOpen()/fread()/hb_processClose()
    + set font attributes: HB_GTI_FONTA_FIXMETRIC, HB_GTI_FONTA_CLRBKG,
      HB_GTI_FONTA_DRAWBOX
This commit is contained in:
Przemyslaw Czerpak
2011-09-12 15:41:28 +00:00
parent 10aaae71c2
commit 9377fc138b
4 changed files with 19 additions and 12 deletions

View File

@@ -16,6 +16,17 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-09-12 17:41 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/src/rtl/filesys.c
* harbour/src/rtl/hbproces.c
! use hb_fsOsError() instead of errno which can be overwritten by
by hb_fsSetIOError()
* harbour/tests/gtxfnt.prg
% hb_processRun() instead of hb_processOpen()/fread()/hb_processClose()
+ set font attributes: HB_GTI_FONTA_FIXMETRIC, HB_GTI_FONTA_CLRBKG,
HB_GTI_FONTA_DRAWBOX
2011-09-11 13:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbformat/hbfmtcls.prg
! fixed casing of some function names.

View File

@@ -950,7 +950,8 @@ HB_SIZE hb_fsPipeIsData( HB_FHANDLE hPipeHandle, HB_SIZE nBufferSize,
hb_fsSetIOError( iResult >= 0, 0 );
if( nTimeOut < 0 && iResult == 0 )
continue;
if( iResult != -1 || nTimeOut == 0 || errno != EINTR ||
if( iResult != -1 || nTimeOut == 0 ||
hb_fsOsError() != ( HB_ERRCODE ) EINTR ||
hb_vmRequestQuery() != 0 )
break;
#if !defined( HB_OS_LINUX )

View File

@@ -751,7 +751,7 @@ int hb_fsProcessValue( HB_FHANDLE hProcess, HB_BOOL fWait )
iRetStatus = waitpid( pid, &iStatus, fWait ? 0 : WNOHANG );
hb_fsSetIOError( iRetStatus >= 0, 0 );
#ifdef ERESTARTSYS
if( iRetStatus < 0 && errno != ERESTARTSYS )
if( iRetStatus < 0 && hb_fsOsError() != ( HB_ERRCODE ) ERESTARTSYS )
#else
if( iRetStatus < 0 )
#endif

View File

@@ -29,6 +29,8 @@ proc main()
n := 2
? hb_gtVersion( 0 ), hb_gtVersion( 1 )
hb_gtInfo( HB_GTI_FONTATTRIBUTE, HB_GTI_FONTA_FIXMETRIC + ;
HB_GTI_FONTA_CLRBKG + HB_GTI_FONTA_DRAWBOX )
while n == 2
? hb_gtInfo( HB_GTI_FONTSEL )
hb_gtInfo( HB_GTI_FONTSEL, xFontSel() )
@@ -43,13 +45,6 @@ proc main()
return
function xfontsel()
local hProcess, hStdOut, cFontSel, n
hProcess := hb_processOpen( "xfontsel -print",, @hStdOut )
if hProcess != -1
cFontSel := space( 256 )
n := fread( hStdOut, @cFontSel, len( cFontSel ) )
cFontSel := left( cFontSel, n )
hb_processClose( hProcess )
fclose( hStdOut )
endif
return cFontSel
local cStdOut
hb_processRun( "xfontsel -print",, @cStdOut )
return cStdOut