mirror of
https://codeberg.org/dnkl/foot.git
synced 2026-04-03 07:15:29 -04:00
term: term_spawn_new: always spawn foot/footclient from PATH
This commit is contained in:
parent
57de9feaa5
commit
a484a65fef
3 changed files with 3 additions and 3 deletions
2
main.c
2
main.c
|
|
@ -224,7 +224,7 @@ main(int argc, char *const *argv)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
if (!as_server && (term = term_init(
|
if (!as_server && (term = term_init(
|
||||||
&conf, fdm, wayl, conf.term, prog_name, argc, argv,
|
&conf, fdm, wayl, conf.term, "foot", argc, argv,
|
||||||
&term_shutdown_cb, &shutdown_ctx)) == NULL)
|
&term_shutdown_cb, &shutdown_ctx)) == NULL)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
|
|
||||||
2
server.c
2
server.c
|
|
@ -213,7 +213,7 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data)
|
||||||
client->term = term_init(
|
client->term = term_init(
|
||||||
server->conf, server->fdm, server->wayl,
|
server->conf, server->fdm, server->wayl,
|
||||||
strlen(term_env) > 0 ? term_env : server->conf->term,
|
strlen(term_env) > 0 ? term_env : server->conf->term,
|
||||||
"footclient" /* TODO */, argc, argv, &term_shutdown_handler, client);
|
"footclient", argc, argv, &term_shutdown_handler, client);
|
||||||
|
|
||||||
if (client->term == NULL) {
|
if (client->term == NULL) {
|
||||||
LOG_ERR("failed to instantiate new terminal");
|
LOG_ERR("failed to instantiate new terminal");
|
||||||
|
|
|
||||||
|
|
@ -1672,7 +1672,7 @@ term_spawn_new(const struct terminal *term)
|
||||||
if (pid2 == 0) {
|
if (pid2 == 0) {
|
||||||
/* Child */
|
/* Child */
|
||||||
close(pipe_fds[0]);
|
close(pipe_fds[0]);
|
||||||
execl(term->foot_exe, term->foot_exe, NULL);
|
execlp(term->foot_exe, term->foot_exe, NULL);
|
||||||
write(pipe_fds[1], &errno, sizeof(errno));
|
write(pipe_fds[1], &errno, sizeof(errno));
|
||||||
_exit(errno);
|
_exit(errno);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue