From cc16948c8598e8b9aa98506dcdad66967dc28712 Mon Sep 17 00:00:00 2001 From: sghctoma Date: Thu, 30 Aug 2018 09:29:05 +0200 Subject: Fix feature macros for FreeBSD On FreeBSD, snprintf and vsnprintf are visible only if _XOPEN_SOURCE >= 600. --- sway/commands.c | 2 +- sway/commands/bar.c | 2 +- sway/commands/output/background.c | 2 +- sway/tree/workspace.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sway') diff --git a/sway/commands.c b/sway/commands.c index d9c54adc..f321a874 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -1,4 +1,4 @@ -#define _XOPEN_SOURCE 500 +#define _XOPEN_SOURCE 600 #include #include #include diff --git a/sway/commands/bar.c b/sway/commands/bar.c index f6a70c17..9d62dc83 100644 --- a/sway/commands/bar.c +++ b/sway/commands/bar.c @@ -1,4 +1,4 @@ -#define _XOPEN_SOURCE 500 +#define _XOPEN_SOURCE 600 #include #include #include diff --git a/sway/commands/output/background.c b/sway/commands/output/background.c index 74894812..900a5e75 100644 --- a/sway/commands/output/background.c +++ b/sway/commands/output/background.c @@ -1,4 +1,4 @@ -#define _XOPEN_SOURCE 500 +#define _XOPEN_SOURCE 600 #include #include #include diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c index 60256336..e7c1e36b 100644 --- a/sway/tree/workspace.c +++ b/sway/tree/workspace.c @@ -1,4 +1,4 @@ -#define _XOPEN_SOURCE 500 +#define _XOPEN_SOURCE 600 #include #include #include -- cgit v1.2.3 From ac7a0aa038fd40472823c4514a846996c7fd2857 Mon Sep 17 00:00:00 2001 From: sghctoma Date: Thu, 30 Aug 2018 10:05:04 +0200 Subject: Add missing destroy calls to server_fini Rootston calls "wlr_xwayland_destroy" and "wl_display_destroy_clients" on shutdown, but these were not called by Sway. Without them, Sway crashes on exit before the display destroy event handler could be called. This causes two problems: - The TTY is not reset, and it locks up after exiting Sway. - drmDropMaster is not called, and the implicit drop (that should occur when the DRM fd is closed) seems not to be working in some scenarios (e.g. if you have a tmux session running - maybe the fd is retained somehow by tmux?). In other words, it you exit Sway, you can't start it (or any other program that wants to be DRM master) again until you close all your tmux sessions. --- sway/server.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'sway') diff --git a/sway/server.c b/sway/server.c index 7fa6007e..92ed5595 100644 --- a/sway/server.c +++ b/sway/server.c @@ -142,6 +142,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); -- cgit v1.2.3 From 67188b7cba2a985926647e049ed32c72b6ee98c8 Mon Sep 17 00:00:00 2001 From: sghctoma Date: Thu, 30 Aug 2018 10:33:48 +0200 Subject: Enable privilege dropping of FreeBSD Privilege dropping works on FreeBSD too, so only the caps parts need to be Linux-only. --- sway/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'sway') 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 -- cgit v1.2.3 From 073dcb3a8650ee45bb98701fccd6530d9dd1a3f4 Mon Sep 17 00:00:00 2001 From: sghctoma Date: Mon, 3 Sep 2018 09:08:49 +0200 Subject: Change _XOPEN_SOURCE defines to _POSIX_C_SOURCE --- client/pool-buffer.c | 2 +- sway/commands.c | 2 +- sway/commands/bar.c | 2 +- sway/commands/output/background.c | 2 +- sway/tree/workspace.c | 2 +- swaybar/ipc.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'sway') diff --git a/client/pool-buffer.c b/client/pool-buffer.c index 6555a3ae..588bd06c 100644 --- a/client/pool-buffer.c +++ b/client/pool-buffer.c @@ -1,4 +1,4 @@ -#define _XOPEN_SOURCE 600 +#define _POSIX_C_SOURCE 200809 #include #include #include diff --git a/sway/commands.c b/sway/commands.c index 9e0fda55..e72b8916 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -1,4 +1,4 @@ -#define _XOPEN_SOURCE 600 +#define _POSIX_C_SOURCE 200809 #include #include #include diff --git a/sway/commands/bar.c b/sway/commands/bar.c index 9d62dc83..f760888e 100644 --- a/sway/commands/bar.c +++ b/sway/commands/bar.c @@ -1,4 +1,4 @@ -#define _XOPEN_SOURCE 600 +#define _POSIX_C_SOURCE 200809 #include #include #include diff --git a/sway/commands/output/background.c b/sway/commands/output/background.c index 900a5e75..ddad679d 100644 --- a/sway/commands/output/background.c +++ b/sway/commands/output/background.c @@ -1,4 +1,4 @@ -#define _XOPEN_SOURCE 600 +#define _POSIX_C_SOURCE 200809 #include #include #include diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c index e7c1e36b..1957d94f 100644 --- a/sway/tree/workspace.c +++ b/sway/tree/workspace.c @@ -1,4 +1,4 @@ -#define _XOPEN_SOURCE 600 +#define _POSIX_C_SOURCE 200809 #include #include #include diff --git a/swaybar/ipc.c b/swaybar/ipc.c index 972869c6..0e60c10c 100644 --- a/swaybar/ipc.c +++ b/swaybar/ipc.c @@ -1,4 +1,4 @@ -#define _XOPEN_SOURCE 600 +#define _POSIX_C_SOURCE 200809 #include #include #include -- cgit v1.2.3