diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2019-11-01 20:10:47 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2019-11-01 20:10:47 +0000 |
| commit | 438d6eaff0b4280492c8a0a161a33daec5de3707 (patch) | |
| tree | 5dd2bb0988475cdf2ea535266a992a93aba738c7 /server.c | |
| parent | term_init(): initialize slave TERM from term_init() argument (diff) | |
client/server: add -t,--term to footclient
Diffstat (limited to 'server.c')
| -rw-r--r-- | server.c | 16 |
1 files changed, 15 insertions, 1 deletions
@@ -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; |
