diff options
-rw-r--r-- | sway/commands.c | 13 |
1 files 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) { | |||
391 | // Var replacement, for all but first argument of set | 391 | // Var replacement, for all but first argument of set |
392 | // TODO commands | 392 | // TODO commands |
393 | for (i = handler->handle == cmd_set ? 2 : 1; i < argc; ++i) { | 393 | for (i = handler->handle == cmd_set ? 2 : 1; i < argc; ++i) { |
394 | if (*argv[i] == '\"' || *argv[i] == '\'') { | ||
395 | strip_quotes(argv[i]); | ||
396 | } | ||
394 | argv[i] = do_var_replacement(argv[i]); | 397 | argv[i] = do_var_replacement(argv[i]); |
395 | unescape_string(argv[i]); | 398 | unescape_string(argv[i]); |
396 | } | 399 | } |
397 | // Strip quotes for first argument. | ||
398 | // TODO This part needs to be handled much better | ||
399 | if (argc>1 && (*argv[1] == '\"' || *argv[1] == '\'')) { | ||
400 | strip_quotes(argv[1]); | ||
401 | } | ||
402 | if (handler->handle) { | 400 | if (handler->handle) { |
403 | results = handler->handle(argc-1, argv+1); | 401 | results = handler->handle(argc-1, argv+1); |
404 | } else { | 402 | } else { |
@@ -422,11 +420,6 @@ struct cmd_results *config_subcommand(char **argv, int argc, | |||
422 | char *input = argv[0] ? argv[0] : "(empty)"; | 420 | char *input = argv[0] ? argv[0] : "(empty)"; |
423 | return cmd_results_new(CMD_INVALID, input, "Unknown/invalid command"); | 421 | return cmd_results_new(CMD_INVALID, input, "Unknown/invalid command"); |
424 | } | 422 | } |
425 | // Strip quotes for first argument. | ||
426 | // TODO This part needs to be handled much better | ||
427 | if (argc > 1 && (*argv[1] == '\"' || *argv[1] == '\'')) { | ||
428 | strip_quotes(argv[1]); | ||
429 | } | ||
430 | if (handler->handle) { | 423 | if (handler->handle) { |
431 | return handler->handle(argc - 1, argv + 1); | 424 | return handler->handle(argc - 1, argv + 1); |
432 | } | 425 | } |