ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makedep: Add a helper function to open a file in the parent's source directory. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2015-11-11 11:54:46 +09:00
parent 391364e0ba
commit ec7664d4db
1 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
tools/makedep.c
View File

@ -488,6 +488,25 @@ static char *replace_extension( const char *name, const char *old_ext, const cha
} }
/*******************************************************************
* replace_filename
*/
static char *replace_filename( const char *path, const char *name )
{
const char *p;
char *ret;
size_t len;
if (!path) return xstrdup( name );
if (!(p = strrchr( path, '/' ))) return xstrdup( name );
len = p - path + 1;
ret = xmalloc( len + strlen( name ) + 1 );
memcpy( ret, path, len );
strcpy( ret + len, name );
return ret;
}
/******************************************************************* /*******************************************************************
* strarray_replace_extension * strarray_replace_extension
*/ */
@ -1200,6 +1219,22 @@ static struct file *open_file( const struct makefile *make, const char *path, ch
} }
/*******************************************************************
* open_file_same_dir
*
* Open a file in the same directory as the parent.
*/
static struct file *open_file_same_dir( const struct incl_file *parent, const char *name, char **filename )
{
char *src_path = replace_filename( parent->file->name, name );
struct file *ret = load_file( src_path );
if (ret) *filename = replace_filename( parent->filename, name );
free( src_path );
return ret;
}
/******************************************************************* /*******************************************************************
* open_local_file * open_local_file
* *
@ -1270,7 +1305,7 @@ static struct file *open_src_file( const struct makefile *make, struct incl_file
static struct file *open_include_file( const struct makefile *make, struct incl_file *pFile ) static struct file *open_include_file( const struct makefile *make, struct incl_file *pFile )
{ {
struct file *file = NULL; struct file *file = NULL;
char *filename, *p; char *filename;
unsigned int i, len; unsigned int i, len;
errno = ENOENT; errno = ENOENT;
@ -1383,15 +1418,7 @@ static struct file *open_include_file( const struct makefile *make, struct incl_
if (pFile->type == INCL_SYSTEM) return NULL; /* ignore system files we cannot find */ if (pFile->type == INCL_SYSTEM) return NULL; /* ignore system files we cannot find */
/* try in src file directory */ /* try in src file directory */
if ((p = strrchr(pFile->included_by->filename, '/'))) if ((file = open_file_same_dir( pFile->included_by, pFile->name, &pFile->filename ))) return file;
{
size_t l = p - pFile->included_by->filename + 1;
filename = xmalloc(l + strlen(pFile->name) + 1);
memcpy( filename, pFile->included_by->filename, l );
strcpy( filename + l, pFile->name );
if ((file = open_file( make, filename, &pFile->filename ))) return file;
free( filename );
}
fprintf( stderr, "%s:%d: error: ", pFile->included_by->file->name, pFile->included_line ); fprintf( stderr, "%s:%d: error: ", pFile->included_by->file->name, pFile->included_line );
perror( pFile->name ); perror( pFile->name );