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

makedep: Add a helper function for concatenating paths.

This commit is contained in:
Alexandre Julliard 2014-03-10 11:10:55 +01:00
parent b2a8a0893f
commit c3c35dcff8
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/makedep.c
View File

@ -453,13 +453,24 @@ static char *get_relative_path( const char *from, const char *dest )
} }
/*******************************************************************
* concat_paths
*/
static char *concat_paths( const char *base, const char *path )
{
if (!base) return xstrdup( path[0] ? path : "." );
if (path[0] == '/') return xstrdup( path );
if (!path[0]) return xstrdup( base );
return strmake( "%s/%s", base, path );
}
/******************************************************************* /*******************************************************************
* base_dir_path * base_dir_path
*/ */
static char *base_dir_path( const char *path ) static char *base_dir_path( const char *path )
{ {
if (base_dir && path[0] != '/') return strmake( "%s/%s", base_dir, path ); return concat_paths( base_dir, path );
return xstrdup( path );
} }
@ -468,8 +479,7 @@ static char *base_dir_path( const char *path )
*/ */
static char *src_dir_path( const char *path ) static char *src_dir_path( const char *path )
{ {
if (src_dir) return strmake( "%s/%s", src_dir, path ); return concat_paths( src_dir, path );
return xstrdup( path );
} }
@ -478,8 +488,7 @@ static char *src_dir_path( const char *path )
*/ */
static char *top_obj_dir_path( const char *path ) static char *top_obj_dir_path( const char *path )
{ {
if (top_obj_dir) return strmake( "%s/%s", top_obj_dir, path ); return concat_paths( top_obj_dir, path );
return xstrdup( path );
} }
@ -488,7 +497,7 @@ static char *top_obj_dir_path( const char *path )
*/ */
static char *top_dir_path( const char *path ) static char *top_dir_path( const char *path )
{ {
if (top_src_dir) return strmake( "%s/%s", top_src_dir, path ); if (top_src_dir) return concat_paths( top_src_dir, path );
return top_obj_dir_path( path ); return top_obj_dir_path( path );
} }