8 files changed, 18 insertions, 11 deletions

diff --git a/sway/commands.c b/sway/commands.c
index 359856cc..e72b8916 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _POSIX_C_SOURCE 200809
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/sway/commands/bar.c b/sway/commands/bar.c
index f6a70c17..f760888e 100644
--- a/sway/commands/bar.c
+++ b/sway/commands/bar.c
@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _POSIX_C_SOURCE 200809
 #include <string.h>
 #include <strings.h>
 #include <wlr/util/log.h>
diff --git a/sway/commands/output/background.c b/sway/commands/output/background.c
index 74894812..ddad679d 100644
--- a/sway/commands/output/background.c
+++ b/sway/commands/output/background.c
@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _POSIX_C_SOURCE 200809
 #include <libgen.h>
 #include <strings.h>
 #include <unistd.h>
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index 5556e5b3..695213eb 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -346,7 +346,8 @@ static void render_titlebar(struct sway_output *output,
         float output_scale = output->wlr_output->scale;
         enum sway_container_layout layout = state->parent->current.layout;
         list_t *children = state->parent->current.children;
-        bool is_last_child = children->items[children->length - 1] == con;
+        bool is_last_child = children->length == 0 ||
+                children->items[children->length - 1] == con;
         double output_x = output->swayc->current.swayc_x;
         double output_y = output->swayc->current.swayc_y;
 
diff --git a/sway/ipc-server.c b/sway/ipc-server.c
index ed710be5..fb5be27b 100644
--- a/sway/ipc-server.c
+++ b/sway/ipc-server.c
@@ -253,8 +253,8 @@ int ipc_client_handle_readable(int client_fd, uint32_t mask, void *data) {
                 return 0;
         }
 
-        client->payload_length = buf32[0];
-        client->current_command = (enum ipc_command_type)buf32[1];
+        memcpy(&client->payload_length, &buf32[0], sizeof(buf32[0]));
+        memcpy(&client->current_command, &buf32[1], sizeof(buf32[1]));
 
         if (read_available - received >= (long)client->payload_length) {
                 ipc_client_handle_command(client);
@@ -832,8 +832,8 @@ bool ipc_send_reply(struct ipc_client *client, const char *payload, uint32_t pay
         uint32_t *data32 = (uint32_t*)(data + sizeof(ipc_magic));
 
         memcpy(data, ipc_magic, sizeof(ipc_magic));
-        data32[0] = payload_length;
-        data32[1] = client->current_command;
+        memcpy(&data32[0], &payload_length, sizeof(payload_length));
+        memcpy(&data32[1], &client->current_command, sizeof(client->current_command));
 
         while (client->write_buffer_len + ipc_header_size + payload_length >=
                                  client->write_buffer_size) {
diff --git a/sway/main.c b/sway/main.c
index 7ed10c86..2f05dc38 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -366,13 +366,15 @@ int main(int argc, char **argv) {
                 return 1;
         }
 
-#ifdef __linux__
+#if defined(__linux__) || defined(__FreeBSD__)
         if (getuid() != geteuid() || getgid() != getegid()) {
+#ifdef __linux__
                 // Retain capabilities after setuid()
                 if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0)) {
                         wlr_log(WLR_ERROR, "Cannot keep caps after setuid()");
                         exit(EXIT_FAILURE);
                 }
+#endif
                 suid = true;
         }
 #endif
@@ -382,7 +384,7 @@ int main(int argc, char **argv) {
         detect_proprietary();
         detect_raspi();
 
-#ifdef __linux__
+#if defined(__linux__) || defined(__FreeBSD__)
         drop_permissions(suid);
 #endif
         // handle SIGTERM signals
diff --git a/sway/server.c b/sway/server.c
index 8b5bc93c..749365cb 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -140,6 +140,10 @@ bool server_init(struct sway_server *server) {
 
 void server_fini(struct sway_server *server) {
         // TODO: free sway-specific resources
+#ifdef HAVE_XWAYLAND
+        wlr_xwayland_destroy(server->xwayland.wlr_xwayland);
+#endif
+        wl_display_destroy_clients(server->wl_display);
         wl_display_destroy(server->wl_display);
         list_free(server->dirty_containers);
         list_free(server->transactions);
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index 60256336..1957d94f 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE 500
+#define _POSIX_C_SOURCE 200809
 #include <ctype.h>
 #include <limits.h>
 #include <stdbool.h>