1 files changed, 10 insertions, 17 deletions

diff --git a/sway/commands.c b/sway/commands.c
index 2160a970..8d003dfa 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -104,6 +103,7 @@ static const struct cmd_handler handlers[] = {
 static const struct cmd_handler config_handlers[] = {
         { "default_orientation", cmd_default_orientation },
         { "include", cmd_include },
+        { "primary_selection", cmd_primary_selection },
         { "swaybg_command", cmd_swaybg_command },
         { "swaynag_command", cmd_swaynag_command },
         { "workspace_layout", cmd_workspace_layout },
@@ -147,7 +147,7 @@ static int handler_compare(const void *_a, const void *_b) {
         return strcasecmp(a->command, b->command);
 }
 
-const struct cmd_handler *find_handler(char *line,
+const struct cmd_handler *find_handler(const char *line,
                 const struct cmd_handler *handlers, size_t handlers_size) {
         if (!handlers || !handlers_size) {
                 return NULL;
@@ -380,10 +380,13 @@ struct cmd_results *config_command(char *exec, char **new_block) {
         sway_log(SWAY_INFO, "Config command: %s", exec);
         const struct cmd_handler *handler = find_core_handler(argv[0]);
         if (!handler || !handler->handle) {
-                const char *error = handler
-                        ? "Command '%s' is shimmed, but unimplemented"
-                        : "Unknown/invalid command '%s'";
-                results = cmd_results_new(CMD_INVALID, error, argv[0]);
+                if (handler) {
+                        results = cmd_results_new(CMD_INVALID,
+                                "Command '%s' is shimmed, but unimplemented", argv[0]);
+                } else {
+                        results = cmd_results_new(CMD_INVALID,
+                                "Unknown/invalid command '%s'", argv[0]);
+                }
                 goto cleanup;
         }
 
@@ -485,20 +488,10 @@ struct cmd_results *cmd_results_new(enum cmd_status status,
         }
         results->status = status;
         if (format) {
-                char *error = NULL;
                 va_list args;
                 va_start(args, format);
-                int slen = vsnprintf(NULL, 0, format, args);
+                results->error = vformat_str(format, args);
                 va_end(args);
-                if (slen > 0) {
-                        error = malloc(slen + 1);
-                        if (error != NULL) {
-                                va_start(args, format);
-                                vsnprintf(error, slen + 1, format, args);
-                                va_end(args);
-                        }
-                }
-                results->error = error;
         } else {
                 results->error = NULL;
         }