open_input_file(): try to open the file in the current directory

before trying the source directory.
This commit is contained in:
Alexandre Julliard 2003-11-20 04:21:56 +00:00
parent cd1a13b00e
commit f01e7c6364
1 changed files with 4 additions and 3 deletions

View File

@ -176,18 +176,19 @@ void dump_bytes( FILE *outfile, const unsigned char *data, int len,
FILE *open_input_file( const char *srcdir, const char *name )
{
char *fullname;
FILE *file;
FILE *file = fopen( name, "r" );
if (srcdir)
if (!file && srcdir)
{
fullname = xmalloc( strlen(srcdir) + strlen(name) + 2 );
strcpy( fullname, srcdir );
strcat( fullname, "/" );
strcat( fullname, name );
file = fopen( fullname, "r" );
}
else fullname = xstrdup( name );
if (!(file = fopen( fullname, "r" ))) fatal_error( "Cannot open file '%s'\n", fullname );
if (!file) fatal_error( "Cannot open file '%s'\n", fullname );
input_file_name = fullname;
current_line = 1;
return file;