From bf2298e0a5265ede7a056f1247a4aab7e76f4b3d Mon Sep 17 00:00:00 2001 From: Denis Doria Date: Fri, 3 Jun 2016 11:26:47 +0200 Subject: [PATCH 1/3] Includes $ for variables without it --- sway/commands.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sway/commands.c b/sway/commands.c index 41233591..e204fb40 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -2146,6 +2146,8 @@ static int compare_set_qsort(const void *_l, const void *_r) { } static struct cmd_results *cmd_set(int argc, char **argv) { + char *tmp; + int size; struct cmd_results *error = NULL; if (!config->reading) return cmd_results_new(CMD_FAILURE, "set", "Can only be used in config file."); if ((error = checkarg(argc, "set", EXPECTED_AT_LEAST, 2))) { @@ -2153,7 +2155,15 @@ static struct cmd_results *cmd_set(int argc, char **argv) { } if (argv[0][0] != '$') { - return cmd_results_new(CMD_FAILURE, "set", "Malformed variable assignment, name has to start with $"); + sway_log(L_INFO, "Warning: variable '%s' doesn't start with $", argv[0]); + + size = asprintf(&tmp, "%s%s", "$", argv[0]); + if (size == -1) { + return cmd_results_new(CMD_FAILURE, "set", "Not possible to create variable $'%s'", argv[0]); + } + + argv[0] = strdup(tmp); + free(tmp); } struct sway_variable *var = NULL; From 29eb3bf7467d721d89cf4a7925d2e41cda91c606 Mon Sep 17 00:00:00 2001 From: Denis Doria Date: Fri, 3 Jun 2016 11:28:10 +0200 Subject: [PATCH 2/3] Put w to uppercase just to keep consistency between warnings --- sway/commands.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sway/commands.c b/sway/commands.c index e204fb40..90a7d421 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -3047,7 +3047,7 @@ static struct cmd_results *bar_cmd_swaybar_command(int argc, char **argv) { } static struct cmd_results *bar_cmd_tray_output(int argc, char **argv) { - sway_log(L_ERROR, "warning: tray_output is not supported on wayland"); + sway_log(L_ERROR, "Warning: tray_output is not supported on wayland"); return cmd_results_new(CMD_SUCCESS, NULL, NULL); } From 3710cd696385db0b7eb2bbc72c5dfff5de5ce711 Mon Sep 17 00:00:00 2001 From: thuck Date: Mon, 6 Jun 2016 22:20:27 +0200 Subject: [PATCH 3/3] Fix segfault when using include with * This should fix the issue #681 --- sway/config.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sway/config.c b/sway/config.c index 15108123..7530e530 100644 --- a/sway/config.c +++ b/sway/config.c @@ -388,6 +388,11 @@ static bool load_include_config(const char *path, const char *parent_dir, struct char *real_path = realpath(full_path, NULL); free(full_path); + if (real_path == NULL) { + sway_log(L_DEBUG, "%s not found.", path); + return false; + } + // check if config has already been included int j; for (j = 0; j < config->config_chain->length; ++j) {