aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Trzaskowski <felipe.trzaskowski@gmail.com>2021-03-13 10:41:05 +0000
committerFelipe Trzaskowski <felipe.trzaskowski@gmail.com>2021-03-13 11:01:38 +0000
commit2dc13cc13b0a8367c12dd217e3e5e08176e2e7ce (patch)
tree9d0f8ad6c20abde7c14196ec59761ff826df7f19
parentadd option to detach the client process from the terminal instance (diff)
fix code style issues and memory leak
-rw-r--r--server.c21
1 files changed, 8 insertions, 13 deletions
diff --git a/server.c b/server.c
index 652c0148..2d813ab2 100644
--- a/server.c
+++ b/server.c
@@ -50,10 +50,7 @@ struct client {
struct terminal_instance *instance;
};
-static void
-client_destroy(struct client *client);
-static void
-client_send_exit_code(struct client *client, int exit_code);
+static void client_destroy(struct client *client);
struct terminal_instance {
struct terminal *terminal;
@@ -61,8 +58,7 @@ struct terminal_instance {
struct client *client;
struct config conf;
};
-static void
-instance_destroy(struct terminal_instance *instance, int exit_code);
+static void instance_destroy(struct terminal_instance *instance, int exit_code);
static void
client_destroy(struct client *client)
@@ -105,9 +101,8 @@ client_send_exit_code(struct client *client, int exit_code)
static void
instance_destroy(struct terminal_instance *instance, int exit_code)
{
- if (instance->terminal != NULL) {
+ if (instance->terminal != NULL)
term_destroy(instance->terminal);
- }
tll_foreach(instance->server->terminals, it) {
if (it->item == instance) {
@@ -117,7 +112,6 @@ instance_destroy(struct terminal_instance *instance, int exit_code)
}
if (instance->client != NULL) {
- LOG_WARN("client FD=%d: is still alive", instance->client->fd);
instance->client->instance = NULL;
client_send_exit_code(instance->client, exit_code);
client_destroy(instance->client);
@@ -287,6 +281,7 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data)
struct terminal_instance *instance = malloc(sizeof(struct terminal_instance));
*instance = (struct terminal_instance) {
+ .client = NULL,
.server = server,
.conf = *server->conf,
};
@@ -331,6 +326,7 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data)
// the instance is attached to the client
instance->client = client;
client->instance = instance;
+ free(argv);
}
return true;
@@ -418,7 +414,6 @@ err:
return ret;
}
-
struct server *
server_init(const struct config *conf, struct fdm *fdm, struct reaper *reaper,
struct wayland *wayl)
@@ -492,7 +487,6 @@ err:
return NULL;
}
-
void
server_destroy(struct server *server)
{
@@ -506,11 +500,12 @@ server_destroy(struct server *server)
client_send_exit_code(it->item, 1);
client_destroy(it->item);
}
+
tll_free(server->clients);
- tll_foreach(server->terminals, it) {
+ tll_foreach(server->terminals, it)
instance_destroy(it->item, 1);
- }
+
tll_free(server->terminals);
fdm_del(server->fdm, server->fd);