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

server: don't cache argc/argv in client context

Browse source
This commit is contained in:
Daniel Eklöf 2019-11-05 09:31:14 +01:00
parent 1c7fb2869d
commit 5f77f0e999
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

35
server.c
View file

@ -35,8 +35,6 @@ struct client {
int fd; int fd;
struct terminal *term; struct terminal *term;
int argc;
char **argv;
}; };
static void static void
@ -50,12 +48,6 @@ client_destroy(struct client *client)
term_destroy(client->term); term_destroy(client->term);
} }
if (client->argv != NULL) {
for (int i = 0; i < client->argc; i++)
free(client->argv[i]);
free(client->argv);
}
if (client->fd != -1) { if (client->fd != -1) {
LOG_DBG("client FD=%d: disconnected", client->fd); LOG_DBG("client FD=%d: disconnected", client->fd);
fdm_del(client->server->fdm, client->fd); fdm_del(client->server->fdm, client->fd);
@ -100,7 +92,10 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data)
{ {
struct client *client = data; struct client *client = data;
struct server *server = client->server; struct server *server = client->server;
char *term_env = NULL; char *term_env = NULL;
char **argv = NULL;
int argc = 0;
if (events & EPOLLHUP) if (events & EPOLLHUP)
goto shutdown; goto shutdown;
@ -118,45 +113,51 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data)
goto shutdown; goto shutdown;
} }
if (recv(fd, &client->argc, sizeof(client->argc), 0) != sizeof(client->argc)) if (recv(fd, &argc, sizeof(argc), 0) != sizeof(argc))
goto shutdown; goto shutdown;
LOG_DBG("argc = %d", client->argc); LOG_DBG("argc = %d", argc);
client->argv = calloc(client->argc + 1, sizeof(client->argv[0])); argv = calloc(argc + 1, sizeof(argv[0]));
for (int i = 0; i < client->argc; i++) { for (int i = 0; i < argc; i++) {
uint16_t len; uint16_t len;
if (recv(fd, &len, sizeof(len), 0) != sizeof(len)) if (recv(fd, &len, sizeof(len), 0) != sizeof(len))
goto shutdown; goto shutdown;
client->argv[i] = malloc(len + 1); argv[i] = malloc(len + 1);
client->argv[i][len] = '\0'; argv[i][len] = '\0';
if (len == 0) if (len == 0)
continue; continue;
if (recv(fd, client->argv[i], len, 0) != len) if (recv(fd, argv[i], len, 0) != len)
goto shutdown; goto shutdown;
LOG_DBG("argv[%d] = %s (%hu)", i, client->argv[i], len); LOG_DBG("argv[%d] = %s (%hu)", i, argv[i], len);
} }
assert(client->term == NULL); assert(client->term == NULL);
client->term = term_init( client->term = term_init(
server->conf, server->fdm, server->wayl, server->conf, server->fdm, server->wayl,
term_env_len > 0 ? term_env : server->conf->term, term_env_len > 0 ? term_env : server->conf->term,
client->argc, client->argv, &term_shutdown_handler, client); 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");
goto shutdown; goto shutdown;
} }
for (int i = 0; i < argc; i++)
free(argv[i]);
free(argv);
free(term_env); free(term_env);
return true; return true;
shutdown: shutdown:
LOG_DBG("client FD=%d: disconnected", client->fd); LOG_DBG("client FD=%d: disconnected", client->fd);
for (int i = 0; i < argc; i++)
free(argv[i]);
free(argv);
free(term_env); free(term_env);
fdm_del(fdm, fd); fdm_del(fdm, fd);