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

libwine: Don't rely on argv[0] in wine_exec_wine_binary if we can get 

the directory from the library itself.
Only try the hardcoded BINDIR if everything else failed.
This commit is contained in:
Alexandre Julliard 2006-02-16 20:06:20 +01:00
parent ca6fd0d4ec
commit 767ad69a45
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libs/wine/config.c
View File

@ -154,7 +154,7 @@ static const char *get_runtime_libdir(void)
} }
/* determine the proper location of the given path based on the current libdir */ /* determine the proper location of the given path based on the current libdir */
static char *get_path_from_libdir( const char *path, const char *filename ) static char *get_path_from_libdir( const char *path, const char *fallback, const char *filename )
{ {
char *p, *ret; char *p, *ret;
const char *libdir = get_runtime_libdir(); const char *libdir = get_runtime_libdir();
@ -184,6 +184,7 @@ static char *get_path_from_libdir( const char *path, const char *filename )
} }
else else
{ {
if (fallback) path = fallback;
ret = xmalloc( strlen(path) + strlen(filename) + 2 ); ret = xmalloc( strlen(path) + strlen(filename) + 2 );
strcpy( ret, path ); strcpy( ret, path );
p = ret + strlen(ret); p = ret + strlen(ret);
@ -229,7 +230,7 @@ const char *get_default_dlldir(void)
{ {
static const char *dlldir; static const char *dlldir;
if (!dlldir) dlldir = get_path_from_libdir( DLLDIR, "" ); if (!dlldir) dlldir = get_path_from_libdir( DLLDIR, NULL, "" );
return dlldir; return dlldir;
} }
@ -409,6 +410,7 @@ static void preloader_exec( char **argv, char **envp, int use_preloader )
/* exec a wine internal binary (either the wine loader or the wine server) */ /* exec a wine internal binary (either the wine loader or the wine server) */
void wine_exec_wine_binary( const char *name, char **argv, char **envp, int use_preloader ) void wine_exec_wine_binary( const char *name, char **argv, char **envp, int use_preloader )
{ {
static const char bindir[] = BINDIR;
const char *path, *pos, *ptr; const char *path, *pos, *ptr;
if (name && strchr( name, '/' )) if (name && strchr( name, '/' ))
@ -419,21 +421,11 @@ void wine_exec_wine_binary( const char *name, char **argv, char **envp, int use_
} }
else if (!name) name = argv0_name; else if (!name) name = argv0_name;
/* first, try bin directory */ /* first, bin directory from the current libdir or argv0 */
argv[0] = get_path_from_libdir( BINDIR, name ); argv[0] = get_path_from_libdir( bindir, argv0_path, name );
preloader_exec( argv, envp, use_preloader ); preloader_exec( argv, envp, use_preloader );
free( argv[0] ); free( argv[0] );
/* now try the path of argv0 of the current binary */
if (argv0_path)
{
argv[0] = xmalloc( strlen(argv0_path) + strlen(name) + 1 );
strcpy( argv[0], argv0_path );
strcat( argv[0], name );
preloader_exec( argv, envp, use_preloader );
free( argv[0] );
}
/* now search in the Unix path */ /* now search in the Unix path */
if ((path = getenv( "PATH" ))) if ((path = getenv( "PATH" )))
{ {
@ -452,4 +444,11 @@ void wine_exec_wine_binary( const char *name, char **argv, char **envp, int use_
} }
free( argv[0] ); free( argv[0] );
} }
/* and finally try BINDIR */
argv[0] = xmalloc( sizeof(bindir) + 1 + strlen(name) );
strcpy( argv[0], bindir );
strcat( argv[0], "/" );
strcat( argv[0], name );
preloader_exec( argv, envp, use_preloader );
} }