mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-20 06:59:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2542 from sghctoma/fix-freebsd-build

Browse source 
FreeBSD fixes
This commit is contained in:
Drew DeVault 2018-09-03 10:59:18 -04:00 • committed by GitHub
commit e4afd33d47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 35 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sway/commands.c
View file

@ -1,4 +1,4 @@
#define _XOPEN_SOURCE 500
#define _POSIX_C_SOURCE 200809
#include <ctype.h>
#include <stdarg.h>
#include <stdlib.h>

2
sway/commands/bar.c
View file

@ -1,4 +1,4 @@
#define _XOPEN_SOURCE 500
#define _POSIX_C_SOURCE 200809
#include <string.h>
#include <strings.h>
#include <wlr/util/log.h>

2
sway/commands/output/background.c
View file

@ -1,4 +1,4 @@
#define _XOPEN_SOURCE 500
#define _POSIX_C_SOURCE 200809
#include <libgen.h>
#include <strings.h>
#include <unistd.h>

6
sway/main.c
View file

@ -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

4
sway/server.c
View file

@ -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);

2
sway/tree/workspace.c
View file

@ -1,4 +1,4 @@
#define _XOPEN_SOURCE 500
#define _POSIX_C_SOURCE 200809
#include <ctype.h>
#include <limits.h>
#include <stdbool.h>