marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libwine: Add a helper function to set the bin directory. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Alexandre Julliard 2017-06-26 13:32:38 +02:00
parent 11c557b66c
commit 161f3fc417
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libs/wine/config.c
View File

@ -374,22 +374,32 @@ static char *running_from_build_dir( const char *basedir )
return path;
}
/* try to set the specified directory as bindir, or set build_dir if it's inside the build directory */
static int set_bindir( char *dir )
{
if (!dir) return 0;
if (is_valid_bindir( dir ))
{
bindir = dir;
}
else
{
build_dir = running_from_build_dir( dir );
free( dir );
}
return bindir || build_dir;
}
/* initialize the argv0 path */
void wine_init_argv0_path( const char *argv0 )
{
const char *basename;
char *libdir;
char *libdir = NULL;
if (!(basename = strrchr( argv0, '/' ))) basename = argv0;
else basename++;
bindir = get_runtime_exedir();
if (bindir && !is_valid_bindir( bindir ))
{
build_dir = running_from_build_dir( bindir );
free( bindir );
bindir = NULL;
}
if (set_bindir( get_runtime_exedir() )) goto done;
libdir = get_runtime_libdir();
if (libdir && !bindir && !build_dir)
@ -399,16 +409,9 @@ void wine_init_argv0_path( const char *argv0 )
}
if (!libdir && !bindir && !build_dir)
{
bindir = get_runtime_argvdir( argv0 );
if (bindir && !is_valid_bindir( bindir ))
{
build_dir = running_from_build_dir( bindir );
free( bindir );
bindir = NULL;
}
}
set_bindir( get_runtime_argvdir( argv0 ));
done:
if (build_dir)
{
argv0_name = build_path( "loader/", basename );