From f9a6407111a8730df51258c3b07502814a8ab3e1 Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Wed, 1 Aug 2018 23:54:40 -0400 Subject: Show swaynag on config errors --- sway/commands.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'sway/commands.c') diff --git a/sway/commands.c b/sway/commands.c index fdae1961..81e9ea42 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -511,11 +511,14 @@ struct cmd_results *cmd_results_new(enum cmd_status status, results->input = NULL; } if (format) { - char *error = malloc(256); va_list args; va_start(args, format); + size_t length = vsnprintf(NULL, 0, format, args) + 1; + char *error = malloc(length); + va_end(args); + va_start(args, format); if (error) { - vsnprintf(error, 256, format, args); + vsnprintf(error, length, format, args); } va_end(args); results->error = error; -- cgit v1.2.3 From a7f7d4a488c8d3b2461122765f9904c8a411a583 Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Thu, 2 Aug 2018 21:37:29 -0400 Subject: Write to swaynag pipe fd directly on config errors --- sway/commands.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'sway/commands.c') diff --git a/sway/commands.c b/sway/commands.c index 81e9ea42..364c26da 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -132,6 +132,7 @@ static struct cmd_handler handlers[] = { static struct cmd_handler config_handlers[] = { { "default_orientation", cmd_default_orientation }, { "swaybg_command", cmd_swaybg_command }, + { "swaynag_command", cmd_swaynag_command }, { "workspace_layout", cmd_workspace_layout }, }; @@ -511,14 +512,11 @@ struct cmd_results *cmd_results_new(enum cmd_status status, results->input = NULL; } if (format) { + char *error = malloc(256); va_list args; va_start(args, format); - size_t length = vsnprintf(NULL, 0, format, args) + 1; - char *error = malloc(length); - va_end(args); - va_start(args, format); if (error) { - vsnprintf(error, length, format, args); + vsnprintf(error, 256, format, args); } va_end(args); results->error = error; -- cgit v1.2.3