client/server: add -t,--term to footclient

This commit is contained in:
Daniel Eklöf 2019-11-01 21:10:47 +01:00
parent 0bd2ddd8ad
commit 438d6eaff0
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
3 changed files with 40 additions and 3 deletions

View file

@ -94,12 +94,22 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data)
{
struct client *client = data;
struct server *server = client->server;
char *term_env = NULL;
if (events & EPOLLHUP)
goto shutdown;
assert(events & EPOLLIN);
uint16_t term_env_len;
if (recv(fd, &term_env_len, sizeof(term_env_len), 0) != sizeof(term_env_len))
goto shutdown;
term_env = malloc(term_env_len + 1);
term_env[term_env_len] = '\0';
if (recv(fd, term_env, term_env_len, 0) != term_env_len)
goto shutdown;
if (recv(fd, &client->argc, sizeof(client->argc), 0) != sizeof(client->argc))
goto shutdown;
@ -117,7 +127,8 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data)
assert(client->term == NULL);
client->term = term_init(
server->conf, server->fdm, server->wayl, server->conf->term,
server->conf, server->fdm, server->wayl,
term_env_len > 0 ? term_env : server->conf->term,
client->argc, client->argv, &term_shutdown_handler, client);
if (client->term == NULL) {
@ -125,11 +136,14 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data)
goto shutdown;
}
free(term_env);
return true;
shutdown:
LOG_DBG("client FD=%d: disconnected", client->fd);
free(term_env);
fdm_del(fdm, fd);
client->fd = -1;