mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-21 05:33:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

main: allow user to override shell on the command line

Browse source
This commit is contained in:
Daniel Eklöf 2019-07-17 09:55:36 +02:00
parent 2046dc0fbd
commit c11cc2be57
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
3 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
main.c
View file

@ -30,6 +30,7 @@
#include "shm.h"
#include "slave.h"
#include "terminal.h"
#include "tokenize.h"
#include "vt.h"
#define min(x, y) ((x) < (y) ? (x) : (y))
@ -305,6 +306,9 @@ main(int argc, char *const *argv)
}
}
argc -= optind;
argv += optind;
setlocale(LC_ALL, "");
setenv("TERM", "xterm-direct", 1); /* TODO: configurable */
@ -558,7 +562,19 @@ main(int argc, char *const *argv)
case 0:
/* Child */
close(fork_pipe[0]); /* Close read end */
slave_spawn(term.ptmx, conf.shell, fork_pipe[1]);
char **_shell_argv = NULL;
char *const *shell_argv = argv;
if (argc == 0) {
if (!tokenize_cmdline(conf.shell, &_shell_argv)) {
(void)!write(fork_pipe[1], &errno, sizeof(errno));
_exit(0);
}
shell_argv = _shell_argv;
}
slave_spawn(term.ptmx, shell_argv, fork_pipe[1]);
assert(false);
break;
@ -576,7 +592,8 @@ main(int argc, char *const *argv)
LOG_ERRNO("failed to read from pipe");
goto out;
} else if (ret == sizeof(_errno)) {
LOG_ERRNO("%s: failed to execute", conf.shell);
LOG_ERRNO(
"%s: failed to execute", argc == 0 ? conf.shell : argv[0]);
goto out;
} else
LOG_DBG("%s: successfully started", conf.shell);