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

2015-09-09 01:29 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* src/rtl/filesys.c
    * implemented hb_fsSetDevMode() only for DOS builds,
      all other platforms always use O_BINARY mode

  * utils/hbmk2/hbmk2.prg
    ! fixed EOL handling in stdout and stderr output
This commit is contained in:
Przemysław Czerpak
2015-09-09 01:29:42 +02:00
parent d090e26669
commit 03f2948f8a
3 changed files with 13 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog.txt
View File

@@ -10,6 +10,14 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2015-09-09 01:29 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* src/rtl/filesys.c
* implemented hb_fsSetDevMode() only for DOS builds,
all other platforms always use O_BINARY mode
* utils/hbmk2/hbmk2.prg
! fixed EOL handling in stdout and stderr output
2015-09-08 20:10 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* src/nortl/nortl.c
+ added hb_fsSetError()

45
src/rtl/filesys.c
View File

@@ -1585,21 +1585,15 @@ int hb_fsSetDevMode( HB_FHANDLE hFileHandle, int iDevMode )
{
HB_TRACE( HB_TR_DEBUG, ( "hb_fsSetDevMode(%p, %d)", ( void * ) ( HB_PTRDIFF ) hFileHandle, iDevMode ) );
#if defined( __BORLANDC__ ) || defined( __IBMCPP__ ) || defined( __DJGPP__ ) || \
defined( __WATCOMC__ ) || defined( HB_OS_OS2 )
#if defined( HB_OS_DOS )
{
int iRet = -1;
int iRet = O_BINARY;
#if defined( HB_OS_WIN )
if( hFileHandle == ( HB_FHANDLE ) 0 ||
hFileHandle == ( HB_FHANDLE ) 1 ||
hFileHandle == ( HB_FHANDLE ) 2 )
#endif
switch( iDevMode )
{
case FD_TEST:
iRet = setmode( ( int ) hFileHandle, O_BINARY );
if( iRet != -1 )
if( iRet != -1 && iRet != O_BINARY )
setmode( ( int ) hFileHandle, iRet );
break;
@@ -1618,39 +1612,6 @@ int hb_fsSetDevMode( HB_FHANDLE hFileHandle, int iDevMode )
return iRet;
}
#elif ( defined( _MSC_VER ) || defined( __MINGW32__ ) || defined( __DMC__ ) ) && \
! defined( HB_OS_WIN_CE )
{
int iRet = -1;
#if defined( HB_OS_WIN )
if( hFileHandle == ( HB_FHANDLE ) 0 ||
hFileHandle == ( HB_FHANDLE ) 1 ||
hFileHandle == ( HB_FHANDLE ) 2 )
#endif
switch( iDevMode )
{
case FD_TEST:
iRet = _setmode( ( int ) hFileHandle, _O_BINARY );
if( iRet != -1 )
( void ) _setmode( ( int ) hFileHandle, iRet );
break;
case FD_BINARY:
iRet = _setmode( ( int ) hFileHandle, _O_BINARY );
break;
case FD_TEXT:
iRet = _setmode( ( int ) hFileHandle, _O_TEXT );
break;
}
if( iRet != -1 )
iRet = ( iRet & _O_TEXT ) == _O_TEXT ? FD_TEXT : FD_BINARY;
hb_fsSetIOError( iRet != -1, 0 );
return iRet;
}
#else
HB_SYMBOL_UNUSED( hFileHandle );

7
utils/hbmk2/hbmk2.prg
View File

@@ -332,7 +332,7 @@ EXTERNAL hbmk_KEYW
system libs. [vszakats] */
#define _IS_AUTOLIBSYSPRE( c ) ( hbmk[ _HBMK_cPLAT ] == "win" .AND. Lower( hb_FNameName( c ) ) == "unicows" )
#define _OUT_EOL e"\n" /* used when displaying text */
#define _OUT_EOL hb_eol() /* used when displaying text */
#define _CHR_EOL Chr( 10 ) /* used when consuming text files */
#define _FIL_EOL Chr( 10 ) /* used when creating source files */
@@ -766,9 +766,6 @@ STATIC PROCEDURE hbmk_local_entry( ... )
/* Handle multitarget command lines */
hb_FSetDevMode( hb_gtInfo( HB_GTI_OUTPUTFD ), FD_TEXT )
hb_FSetDevMode( hb_gtInfo( HB_GTI_ERRORFD ), FD_TEXT )
nTargetTO_DO := 1
WHILE .T.
@@ -15577,7 +15574,7 @@ STATIC FUNCTION ToMarkdown( cText, cStyle )
"<" => "&lt;", ;
">" => "&gt;", ;
"(c)" => "&copy;", ;
e"\n" => " " + _OUT_EOL, ;
e"\n" => " " + Chr( 10 ), ;
"\" => "\\", ;
"`" => "\`", ;
"*" => "\*", ;