LADI
/
ladish
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ladishd: start terminal apps through shell 

This will allow expansion of env vars used in commandline to happen
when apps are started in terminal. It already happens when apps are
started without terminal.

This breaks the default title, at least for xterm. For it, it is now
set explicitly.

Starting through shell is not used when there is no '$' in the
commandline. This should minimize the title problems when xterm is not
used.
This commit is contained in:
Nedko Arnaudov 2010-11-18 02:15:38 +02:00
parent a88ec8d69f
commit d027731b18
1 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
daemon/loader.c
View File

@ -255,9 +255,17 @@ static void loader_exec_program_in_xterm(const char * const * argv)
}
#endif
static void loader_exec_program(const char * commandline, const char * working_dir, bool run_in_terminal)
static
void
loader_exec_program(
const char * commandline,
const char * working_dir,
bool run_in_terminal,
const char * vgraph_name,
const char * app_name)
{
const char * argv[4];
const char * argv[8];
unsigned int i;
/* for non terminal processes we use forkpty() that calls login_tty() that calls setsid() */
/* we can successful call setsid() only once */
@ -276,27 +284,38 @@ static void loader_exec_program(const char * commandline, const char * working_d
log_error("Could not change directory to working dir '%s' for program '%s': %s", working_dir, argv[0], strerror(errno));
}
i = 0;
if (run_in_terminal)
{
if (!conf_get(LADISH_CONF_KEY_DAEMON_TERMINAL, argv))
if (!conf_get(LADISH_CONF_KEY_DAEMON_TERMINAL, argv + i))
{
argv[0] = LADISH_CONF_KEY_DAEMON_TERMINAL_DEFAULT;
argv[i] = LADISH_CONF_KEY_DAEMON_TERMINAL_DEFAULT;
}
i++;
if (strcmp(argv[0], "xterm") == 0 &&
strchr(app_name, '"') == NULL &&
strchr(app_name, '\'') == NULL &&
strchr(app_name, '`') == NULL)
{
argv[i++] = "-T";
argv[i++] = app_name;
}
argv[1] = "-e";
argv[i++] = "-e";
}
else
if (!conf_get(LADISH_CONF_KEY_DAEMON_SHELL, argv + i))
{
if (!conf_get(LADISH_CONF_KEY_DAEMON_SHELL, argv))
{
argv[0] = LADISH_CONF_KEY_DAEMON_SHELL_DEFAULT;
}
argv[1] = "-c";
argv[i] = LADISH_CONF_KEY_DAEMON_SHELL_DEFAULT;
}
i++;
argv[2] = commandline;
argv[3] = NULL;
argv[i++] = "-c";
argv[i++] = commandline;
argv[i++] = NULL;
log_info("Executing '%s' with PID %llu", commandline, (unsigned long long)getpid());
@ -554,7 +573,7 @@ loader_execute(
putenv("LD_PRELOAD=libalsapid.so");
loader_exec_program(commandline, working_dir, run_in_terminal);
loader_exec_program(commandline, working_dir, run_in_terminal, vgraph_name, app_name);
return false; /* We should never get here */
}