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

2015-06-24 20:32 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* src/pp/ppcore.c
    ! fixed directory include precedence in #included files which
      are not marked as system headers (system headers are enclosed in <>)
      Now the following order is used:
         1) try to access included file as is starting from current directory
         2) if included file has relative path then check if the first
            compiled file has path and if yes try to access file using this
            path as start point
         3) check INCLUDE paths (envvar and -I parameter)
      Previous version used: 2 for nested files or 1 for first file or when
      first file was given without path then 3.
      Now we are Cl*pper compatible but such version strongly depends on
      current directory which has the highest priority. Personally I do no
      like such behavior because it may give different results when current
      directory is changed.
This commit is contained in:
Przemysław Czerpak
2015-06-24 20:32:30 +02:00
parent 0adb08bdbd
commit f566a9282c
2 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog.txt
View File

@@ -10,6 +10,23 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2015-06-24 20:32 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* src/pp/ppcore.c
! fixed directory include precedence in #included files which
are not marked as system headers (system headers are enclosed in <>)
Now the following order is used:
1) try to access included file as is starting from current directory
2) if included file has relative path then check if the first
compiled file has path and if yes try to access file using this
path as start point
3) check INCLUDE paths (envvar and -I parameter)
Previous version used: 2 for nested files or 1 for first file or when
first file was given without path then 3.
Now we are Cl*pper compatible but such version strongly depends on
current directory which has the highest priority. Personally I do no
like such behavior because it may give different results when current
directory is changed.
2015-06-24 13:49 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* utils/hbmk2/hbmk2.prg
! fix header search algorithm to handle headers specified

18
src/pp/ppcore.c
View File

@@ -1959,7 +1959,11 @@ static PHB_PP_FILE hb_pp_FileNew( PHB_PP_STATE pState, const char * szFileName,
pFileName->szExtension = NULL;
if( ! fSysFile )
{
if( ! pFileName->szPath || ! pFileName->szPath[ 0 ] )
file_in = hb_fopen( szFileName, fBinary ? "rb" : "r" );
if( ! file_in &&
( ! pFileName->szPath || ! pFileName->szPath[ 0 ] ||
( ! pFileName->szDrive &&
! strchr( HB_OS_PATH_DELIM_CHR_LIST, ( HB_UCHAR ) pFileName->szPath[ 0 ] ) ) ) )
{
char * szFirstFName = NULL;
pFile = pState->pFile;
@@ -1972,14 +1976,16 @@ static PHB_PP_FILE hb_pp_FileNew( PHB_PP_STATE pState, const char * szFileName,
if( szFirstFName )
{
PHB_FNAME pFirstFName = hb_fsFNameSplit( szFirstFName );
pFileName->szPath = pFirstFName->szPath;
hb_fsFNameMerge( szFileNameBuf, pFileName );
szFileName = szFileNameBuf;
if( pFirstFName->szPath && pFirstFName->szPath[ 0 ] )
{
pFileName->szPath = pFirstFName->szPath;
hb_fsFNameMerge( szFileNameBuf, pFileName );
szFileName = szFileNameBuf;
file_in = hb_fopen( szFileName, fBinary ? "rb" : "r" );
}
hb_xfree( pFirstFName );
}
}
file_in = hb_fopen( szFileName, fBinary ? "rb" : "r" );
if( file_in )
iAction = HB_PP_OPEN_OK;
else