aboutsummaryrefslogtreecommitdiff
path: root/slave.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-07-17 07:55:36 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-07-17 07:55:36 +0000
commitc11cc2be5736ccd509d2f452ee83e1217a699835 (patch)
treeb1085d0fde2b9bd5ebe853db82335c5f5e4ae813 /slave.c
parentslave: break out command line tokenizer (diff)
main: allow user to override shell on the command line
Diffstat (limited to 'slave.c')
-rw-r--r--slave.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/slave.c b/slave.c
index 86d5b94f..18fcf3ad 100644
--- a/slave.c
+++ b/slave.c
@@ -11,18 +11,13 @@
#define LOG_MODULE "slave"
#define LOG_ENABLE_DBG 0
#include "log.h"
-#include "tokenize.h"
void
-slave_spawn(int ptmx, char *cmd, int err_fd)
+slave_spawn(int ptmx, char *const argv[], int err_fd)
{
int pts = -1;
const char *pts_name = ptsname(ptmx);
- char **argv = NULL;
- if (!tokenize_cmdline(cmd, &argv))
- goto err;
-
if (grantpt(ptmx) == -1) {
LOG_ERRNO("failed to grantpt()");
goto err;
@@ -61,8 +56,6 @@ slave_spawn(int ptmx, char *cmd, int err_fd)
err:
(void)!write(err_fd, &errno, sizeof(errno));
- if (argv)
- free(argv);
if (pts != -1)
close(pts);
if (ptmx != -1)