Skip to content

W
wine-winehq
Commit 94237ded authored by Huw D M Davies's avatar Huw D M Davies Committed by Alexandre Julliard
Browse files
Options

Fix for starting server from the current directory.

parent d80ce300
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
scheduler/client.c
View file @ 94237ded
...@@ -361,6 +361,7 @@ static void start_server( const char *oldcwd ) ...@@ -361,6 +361,7 @@ static void start_server( const char *oldcwd )
strcpy( p, "/server/wineserver" ); strcpy( p, "/server/wineserver" );
execl( path, "wineserver", NULL ); execl( path, "wineserver", NULL );
} }
free(path);
} }
/* now try the path */ /* now try the path */
...@@ -369,13 +370,12 @@ static void start_server( const char *oldcwd ) ...@@ -369,13 +370,12 @@ static void start_server( const char *oldcwd )
/* and finally the current dir */ /* and finally the current dir */
if (!(path = malloc( strlen(oldcwd) + 20 ))) if (!(path = malloc( strlen(oldcwd) + 20 )))
fatal_error( "out of memory\n" ); fatal_error( "out of memory\n" );
if ((p = strrchr( strcpy( path, oldcwd ), '/' ))) p = strcpy( path, oldcwd ) + strlen( oldcwd );
{ strcpy( p, "/wineserver" );
strcpy( p, "/wineserver" ); execl( path, "wineserver", NULL );
execl( path, "wineserver", NULL ); strcpy( p, "/server/wineserver" );
strcpy( p, "/server/wineserver" ); execl( path, "wineserver", NULL );
execl( path, "wineserver", NULL ); free(path);
}
fatal_error( "could not exec wineserver\n" ); fatal_error( "could not exec wineserver\n" );
} }
started = 1; started = 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment