From af45ee2d8be0d36436d3714f8b6e71cbc4115098 Mon Sep 17 00:00:00 2001
From: Brian Ashworth <bosrsf04@gmail.com>
Date: Sat, 15 Sep 2018 22:21:12 -0400
Subject: Handle shell special characters in bg file path

This changes it back so the path given to swaybg is enclosed in quotes.

Additionally, the only character that is escaped in the path stored is
double quotes now. This makes it so we don't need to keep an exhaustive
list of characters that need to be escaped.

The end user will still need to escape these characters in their config
or when passed to swaybg.
---
 sway/commands/output/background.c | 18 ++++++------------
 sway/config/output.c              |  4 ++--
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/sway/commands/output/background.c b/sway/commands/output/background.c
index 9e370d43..30fb47c4 100644
--- a/sway/commands/output/background.c
+++ b/sway/commands/output/background.c
@@ -123,19 +123,13 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
 			}
 			free(src);
 		} else {
-			// Escape spaces and quotes in the final path for swaybg
+			// Escape double quotes in the final path for swaybg
 			for (size_t i = 0; i < strlen(src); i++) {
-				switch (src[i]) {
-					case ' ':
-					case '\'':
-					case '\"':
-						src = realloc(src, strlen(src) + 2);
-						memmove(src + i + 1, src + i, strlen(src + i) + 1);
-						*(src + i) = '\\';
-						i++;
-						break;
-					default:
-						break;
+				if (src[i] == '"') {
+					src = realloc(src, strlen(src) + 2);
+					memmove(src + i + 1, src + i, strlen(src + i) + 1);
+					*(src + i) = '\\';
+					i++;
 				}
 			}
 
diff --git a/sway/config/output.c b/sway/config/output.c
index 74d79130..6f337b66 100644
--- a/sway/config/output.c
+++ b/sway/config/output.c
@@ -237,7 +237,7 @@ void apply_output_config(struct output_config *oc, struct sway_output *output) {
 		wlr_log(WLR_DEBUG, "Setting background for output %d to %s",
 				output_i, oc->background);
 
-		size_t len = snprintf(NULL, 0, "%s %d %s %s %s",
+		size_t len = snprintf(NULL, 0, "%s %d \"%s\" %s %s",
 				config->swaybg_command ? config->swaybg_command : "swaybg",
 				output_i, oc->background, oc->background_option,
 				oc->background_fallback ? oc->background_fallback : "");
@@ -246,7 +246,7 @@ void apply_output_config(struct output_config *oc, struct sway_output *output) {
 			wlr_log(WLR_DEBUG, "Unable to allocate swaybg command");
 			return;
 		}
-		snprintf(command, len + 1, "%s %d %s %s %s",
+		snprintf(command, len + 1, "%s %d \"%s\" %s %s",
 				config->swaybg_command ? config->swaybg_command : "swaybg",
 				output_i, oc->background, oc->background_option,
 				oc->background_fallback ? oc->background_fallback : "");
-- 
cgit v1.2.3-70-g09d2


From 0a0cf4540ab57ba4af6fb547fd5c1a1df61fb8cf Mon Sep 17 00:00:00 2001
From: Brian Ashworth <bosrsf04@gmail.com>
Date: Tue, 18 Sep 2018 21:44:40 -0400
Subject: Fix quote handling for commands

Quotes are now stripped for all arguments and stripped before anything is unescaped
---
 sway/commands.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/sway/commands.c b/sway/commands.c
index bff230f7..03761c52 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -391,14 +391,12 @@ struct cmd_results *config_command(char *exec) {
 	// Var replacement, for all but first argument of set
 	// TODO commands
 	for (i = handler->handle == cmd_set ? 2 : 1; i < argc; ++i) {
+		if (*argv[i] == '\"' || *argv[i] == '\'') {
+			strip_quotes(argv[i]);
+		}
 		argv[i] = do_var_replacement(argv[i]);
 		unescape_string(argv[i]);
 	}
-	// Strip quotes for first argument.
-	// TODO This part needs to be handled much better
-	if (argc>1 && (*argv[1] == '\"' || *argv[1] == '\'')) {
-		strip_quotes(argv[1]);
-	}
 	if (handler->handle) {
 		results = handler->handle(argc-1, argv+1);
 	} else {
@@ -422,11 +420,6 @@ struct cmd_results *config_subcommand(char **argv, int argc,
 		char *input = argv[0] ? argv[0] : "(empty)";
 		return cmd_results_new(CMD_INVALID, input, "Unknown/invalid command");
 	}
-	// Strip quotes for first argument.
-	// TODO This part needs to be handled much better
-	if (argc > 1 && (*argv[1] == '\"' || *argv[1] == '\'')) {
-		strip_quotes(argv[1]);
-	}
 	if (handler->handle) {
 		return handler->handle(argc - 1, argv + 1);
 	}
-- 
cgit v1.2.3-70-g09d2