Merge branch 'master' of git://github.com/SirCmpwn/sway into new-command-aliases

sway/commands/assign.c

@@ -1,3 +1,4 @@
+#define _XOPEN_SOURCE 500
 #include <stdio.h>
 #include <string.h>
 #include "sway/commands.h"

sway/commands/bar.c

@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "log.h"

sway/commands/bar/binding_mode_indicator.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "log.h"
 

sway/commands/bar/hidden_state.c

@@ -1,4 +1,6 @@
+#define _XOPEN_SOURCE 500
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/ipc-server.h"

sway/commands/bar/id.c

@@ -1,3 +1,4 @@
+#define _XOPEN_SOURCE 500
 #include <string.h>
 #include "sway/commands.h"
 #include "log.h"

sway/commands/bar/mode.c

@@ -1,4 +1,6 @@
+#define _XOPEN_SOURCE 500
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/ipc-server.h"

sway/commands/bar/output.c

@@ -1,3 +1,4 @@
+#define _XOPEN_SOURCE 500
 #include <string.h>
 #include "sway/commands.h"
 #include "list.h"

sway/commands/bar/pango_markup.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "log.h"
 

sway/commands/bar/position.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "log.h"
 

sway/commands/bar/separator_symbol.c

@@ -1,3 +1,4 @@
+#define _XOPEN_SOURCE 500
 #include <string.h>
 #include "sway/commands.h"
 #include "log.h"

sway/commands/bar/strip_workspace_numbers.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "log.h"
 

sway/commands/bar/tray_padding.c

@@ -1,5 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "log.h"
 

sway/commands/bar/workspace_buttons.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "log.h"
 

sway/commands/bar/wrap_scroll.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "log.h"
 

sway/commands/border.c

@@ -1,6 +1,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/container.h"
 #include "sway/focus.h"

sway/commands/debuglog.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "log.h"
 

sway/commands/default_border.c

@@ -1,5 +1,6 @@
 #include <errno.h>
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/container.h"
 

sway/commands/default_floating_border.c

@@ -1,5 +1,6 @@
 #include <errno.h>
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/container.h"
 

sway/commands/exec_always.c

@@ -1,3 +1,4 @@
+#define _XOPEN_SOURCE 500
 #include <string.h>
 #include <sys/wait.h>
 #include <unistd.h>

sway/commands/floating.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/container.h"
 #include "sway/ipc-server.h"

sway/commands/floating_mod.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/input_state.h"
 #include "list.h"

sway/commands/floating_scroll.c

@@ -1,4 +1,6 @@
+#define _XOPEN_SOURCE 500
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "log.h"
 #include "stringop.h"

sway/commands/focus.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include <wlc/wlc.h>
 #include "sway/commands.h"
 #include "sway/container.h"

sway/commands/focus_follows_mouse.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 
 struct cmd_results *cmd_focus_follows_mouse(int argc, char **argv) {

sway/commands/font.c

@@ -1,3 +1,4 @@
+#define _XOPEN_SOURCE 500
 #include <string.h>
 #include "sway/border.h"
 #include "sway/commands.h"

sway/commands/for_window.c

@@ -1,3 +1,4 @@
+#define _XOPEN_SOURCE 500
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/criteria.h"

sway/commands/force_focus_wrapping.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 
 struct cmd_results *cmd_force_focus_wrapping(int argc, char **argv) {

sway/commands/gaps.c

@@ -2,6 +2,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/container.h"
 #include "sway/focus.h"

sway/commands/hide_edge_borders.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 
 struct cmd_results *cmd_hide_edge_borders(int argc, char **argv) {

sway/commands/input.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/input.h"
 #include "log.h"

sway/commands/input/accel_profile.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/input.h"
 

sway/commands/input/click_method.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/input.h"
 #include "log.h"

sway/commands/input/drag_lock.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/input.h"
 

sway/commands/input/dwt.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/input.h"
 

sway/commands/input/events.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/input.h"
 #include "log.h"

sway/commands/input/left_handed.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/input.h"
 

sway/commands/input/middle_emulation.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/input.h"
 

sway/commands/input/natural_scroll.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/input.h"
 

sway/commands/input/scroll_method.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/input.h"
 

sway/commands/input/tap.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/input.h"
 #include "log.h"

sway/commands/layout.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/container.h"
 #include "sway/layout.h"

sway/commands/log_colors.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "log.h"
 

sway/commands/mode.c

@@ -1,5 +1,7 @@
+#define _XOPEN_SOURCE 500
 #include <stdbool.h>
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/ipc-server.h"

sway/commands/mouse_warping.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 
 struct cmd_results *cmd_mouse_warping(int argc, char **argv) {

sway/commands/move.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include <wlc/wlc.h>
 #include "sway/commands.h"
 #include "sway/container.h"

sway/commands/orientation.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 
 struct cmd_results *cmd_orientation(int argc, char **argv) {

sway/commands/output.c

@@ -1,7 +1,9 @@
+#define _XOPEN_SOURCE 500
 #include <ctype.h>
 #include <libgen.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <unistd.h>
 #include <wordexp.h>
 #include "sway/commands.h"

sway/commands/resize.c

@@ -3,6 +3,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <wlc/wlc.h>
 #include "sway/commands.h"
 #include "sway/layout.h"

sway/commands/scratchpad.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include <wlc/wlc.h>
 #include "sway/commands.h"
 #include "sway/container.h"

sway/commands/seamless_mouse.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 
 struct cmd_results *cmd_seamless_mouse(int argc, char **argv) {

sway/commands/set.c

@@ -1,5 +1,7 @@
+#define _XOPEN_SOURCE 500
 #include <stdio.h>
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "list.h"
@@ -14,7 +16,6 @@ static int compare_set_qsort(const void *_l, const void *_r) {
 
 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))) {
@@ -24,13 +25,14 @@ struct cmd_results *cmd_set(int argc, char **argv) {
 	if (argv[0][0] != '$') {
 		sway_log(L_INFO, "Warning: variable '%s' doesn't start with $", argv[0]);
 
-		size = asprintf(&tmp, "%s%s", "$", argv[0]);
-		if (size == -1) {
+		size_t size = snprintf(NULL, 0, "$%s", argv[0]);
+		tmp = malloc(size + 1);
+		if (!tmp) {
 			return cmd_results_new(CMD_FAILURE, "set", "Not possible to create variable $'%s'", argv[0]);
 		}
+		snprintf(tmp, size, "$%s", argv[0]);
 
-		argv[0] = strdup(tmp);
-		free(tmp);
+		argv[0] = tmp;
 	}
 
 	struct sway_variable *var = NULL;

sway/commands/smart_gaps.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 
 struct cmd_results *cmd_smart_gaps(int argc, char **argv) {

sway/commands/split.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include <wlc/wlc-render.h>
 #include "sway/border.h"
 #include "sway/commands.h"

sway/commands/workspace.c

@@ -1,4 +1,6 @@
+#define _XOPEN_SOURCE 500
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/input_state.h"

sway/commands/workspace_auto_back_and_forth.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 
 struct cmd_results *cmd_ws_auto_back_and_forth(int argc, char **argv) {

sway/commands/workspace_layout.c

@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 
 struct cmd_results *cmd_workspace_layout(int argc, char **argv) {