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

2015-12-15 19:50 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* src/common/hbfopen.c
    * use *fsopen() function instead of *fopen() in most of
      DOS, OS2 and MS-Windows builds
This commit is contained in:
Przemysław Czerpak
2015-12-15 19:50:35 +01:00
parent a50c962be3
commit e44ed3d3df
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog.txt
View File

@@ -10,6 +10,11 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2015-12-15 19:50 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* src/common/hbfopen.c
* use *fsopen() function instead of *fopen() in most of
DOS, OS2 and MS-Windows builds
2015-12-14 16:26 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* config/os2/watcom.mk
+ added -bd to Watcom C switches used to compile files for Harbour DLL.

27
src/common/hbfopen.c
View File

@@ -59,6 +59,19 @@
#include "hbwinuni.h"
#endif
#if ( defined( HB_OS_WIN ) || defined( HB_OS_OS2 ) || defined( HB_OS_DOS ) ) && \
( defined( __WATCOMC__ ) || defined( _MSC_VER ) || \
defined( __MINGW32__ ) || defined( __BORLANDC__ ) || \
defined( __DMC__ ) )
#define HB_USE_FSOPEN
#include <share.h>
#if ! defined( SH_DENYNO ) && defined( _SH_DENYNO )
#define SH_DENYNO _SH_DENYNO
#endif
#endif
FILE * hb_fopen( const char * path, const char * mode )
{
FILE * file;
@@ -71,8 +84,11 @@ FILE * hb_fopen( const char * path, const char * mode )
lpMode = HB_FSNAMECONV( mode, &lpFreeM );
hb_vmUnlock();
#if defined( _MSC_VER ) && _MSC_VER >= 1400 && ! defined( _CRT_SECURE_NO_WARNINGS )
_wfopen_s( &file, lpPath, lpMode );
#if defined( HB_USE_FSOPEN )
file = _wfsopen( lpPath, lpMode, SH_DENYNO );
#elif defined( _MSC_VER ) && _MSC_VER >= 1400 && ! defined( _CRT_SECURE_NO_WARNINGS )
if( _wfopen_s( &file, lpPath, lpMode ) != 0 )
file = NULL;
#else
file = _wfopen( lpPath, lpMode );
#endif
@@ -88,8 +104,11 @@ FILE * hb_fopen( const char * path, const char * mode )
path = hb_fsNameConv( path, &pszFree );
hb_vmUnlock();
#if defined( _MSC_VER ) && _MSC_VER >= 1400 && ! defined( _CRT_SECURE_NO_WARNINGS )
fopen_s( &file, path, mode );
#if defined( HB_USE_FSOPEN )
file = _fsopen( path, mode, SH_DENYNO );
#elif defined( _MSC_VER ) && _MSC_VER >= 1400 && ! defined( _CRT_SECURE_NO_WARNINGS )
if( fopen_s( &file, path, mode ) != 0 )
file = NULL;
#else
file = fopen( path, mode );
#endif