mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NSM: const fix in NSM proxy.

This commit is contained in:
Jonathan Moore Liles 2012-06-24 11:48:11 -07:00
parent 7f8de0710a
commit f4dace9983
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
session-manager/src/nsm-proxy.C
View File

@ -109,17 +109,18 @@ public:
// char *args[] = { strdup( executable ), NULL }; // char *args[] = { strdup( executable ), NULL };
char *cmd; char *cmd;
if ( _arguments ) if ( _arguments )
asprintf( &cmd, "exec %s %s", _executable, _arguments ); asprintf( &cmd, "exec %s %s", _executable, _arguments );
else else
asprintf( &cmd, "exec %s", _executable ); asprintf( &cmd, "exec %s", _executable );
const char *args[] = { _executable, "-c", cmd, NULL }; char *args[] = { _executable, strdup( "-c" ), cmd, NULL };
setenv( "NSM_CLIENT_ID", nsm_client_id, 1 ); setenv( "NSM_CLIENT_ID", nsm_client_id, 1 );
setenv( "NSM_SESSION_NAME", nsm_display_name, 1 ); setenv( "NSM_SESSION_NAME", nsm_display_name, 1 );
if ( -1 == execvp( "/bin/sh", (char**)args ) ) if ( -1 == execvp( "/bin/sh", args ) )
{ {
WARNING( "Error starting process: %s", strerror( errno ) ); WARNING( "Error starting process: %s", strerror( errno ) );
@ -357,9 +358,9 @@ show_gui ( void )
char *url = lo_server_get_url( losrv ); char *url = lo_server_get_url( losrv );
const char *args[] = { executable, "--connect-to", url, NULL }; char *args[] = { executable, strdup( "--connect-to" ), url, NULL };
if ( -1 == execvp( executable, (char**)args ) ) if ( -1 == execvp( executable, args ) )
{ {
WARNING( "Error starting process: %s", strerror( errno ) ); WARNING( "Error starting process: %s", strerror( errno ) );