Try to open source file in current directory first in case it is a
generated file.
This commit is contained in:
parent
bc8b8a2221
commit
184c40a397
|
@ -189,18 +189,24 @@ static FILE *open_src_file( INCL_FILE *pFile )
|
||||||
{
|
{
|
||||||
FILE *file;
|
FILE *file;
|
||||||
|
|
||||||
|
/* first try name as is */
|
||||||
|
if ((file = fopen( pFile->name, "r" )))
|
||||||
|
{
|
||||||
|
pFile->filename = xstrdup( pFile->name );
|
||||||
|
return file;
|
||||||
|
}
|
||||||
|
/* now try in source dir */
|
||||||
if (SrcDir)
|
if (SrcDir)
|
||||||
{
|
{
|
||||||
pFile->filename = xmalloc( strlen(SrcDir) + strlen(pFile->name) + 2 );
|
pFile->filename = xmalloc( strlen(SrcDir) + strlen(pFile->name) + 2 );
|
||||||
strcpy( pFile->filename, SrcDir );
|
strcpy( pFile->filename, SrcDir );
|
||||||
strcat( pFile->filename, "/" );
|
strcat( pFile->filename, "/" );
|
||||||
strcat( pFile->filename, pFile->name );
|
strcat( pFile->filename, pFile->name );
|
||||||
|
file = fopen( pFile->filename, "r" );
|
||||||
}
|
}
|
||||||
else pFile->filename = xstrdup( pFile->name );
|
if (!file)
|
||||||
|
|
||||||
if (!(file = fopen( pFile->filename, "r" )))
|
|
||||||
{
|
{
|
||||||
perror( pFile->filename );
|
perror( pFile->name );
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
return file;
|
return file;
|
||||||
|
|
Loading…
Reference in New Issue