mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-04-03 02:47:46 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename symbol set_cloexec to sway_set_cloexec, remove duplicates.

Browse source 
set_cloexec is defined by both sway and wlroots (and who-knows-else),
so rename the sway one for supporting static linkage. We also remove
the duplicate version of this in client/.

Fixes: https://github.com/swaywm/sway/issues/4677
This commit is contained in:
Sheena Artrip 2019-10-28 22:54:16 -07:00 • committed by Drew DeVault
parent cf95de9cae
commit 7efb5d4673
6 changed files with 11 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

16
client/pool-buffer.c
View file

@ -11,19 +11,7 @@
#include <wayland-client.h>
#include "config.h"
#include "pool-buffer.h"
static bool set_cloexec(int fd) {
long flags = fcntl(fd, F_GETFD);
if (flags == -1) {
return false;
}
if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) == -1) {
return false;
}
return true;
}
#include "util.h"
static int create_pool_file(size_t size, char **name) {
static const char template[] = "sway-client-XXXXXX";
@ -46,7 +34,7 @@ static int create_pool_file(size_t size, char **name) {
return -1;
}
if (!set_cloexec(fd)) {
if (!sway_set_cloexec(fd, true)) {
close(fd);
return -1;
}