hiro/spectrwm
1
0
Fork 0
mirror of https://github.com/vale981/spectrwm synced 2025-03-04 17:31:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to latest pledge(2).

Browse source 
From bket@openbsd
This commit is contained in:
David Hill 2019-01-07 10:30:49 -05:00 • committed by Marco Peereboom
parent 6326e0c4cb
commit fa700434ef
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
netbsd/Makefile
View file

@ -25,6 +25,7 @@ all: spectrwm libswmhack.so.$(LVERS)
spectrwm.c: spectrwm.c:
ln -sf ../spectrwm.c ln -sf ../spectrwm.c
ln -sf ../version.h ln -sf ../version.h
ln -sf ../linux/pledge.h
swm_hack.c: swm_hack.c:
ln -sf ../lib/swm_hack.c ln -sf ../lib/swm_hack.c

22
spectrwm.c
View file

@ -3868,9 +3868,6 @@ spawn(int ws_idx, union arg *args, bool close_fd)
if (args == NULL || args->argv[0] == NULL) if (args == NULL || args->argv[0] == NULL)
return; return;
if (pledge("stdio proc exec", NULL) == -1)
err(1, "pledge");
DNPRINTF(SWM_D_MISC, "%s\n", args->argv[0]); DNPRINTF(SWM_D_MISC, "%s\n", args->argv[0]);
close(xcb_get_file_descriptor(conn)); close(xcb_get_file_descriptor(conn));
@ -12460,7 +12457,8 @@ main(int argc, char *argv[])
if (setlocale(LC_CTYPE, "") == NULL || setlocale(LC_TIME, "") == NULL) if (setlocale(LC_CTYPE, "") == NULL || setlocale(LC_TIME, "") == NULL)
warnx("no locale support"); warnx("no locale support");
if (pledge("stdio rpath proc exec getpw dns unix", NULL) == -1) if (pledge("stdio proc exec cpath rpath wpath fattr getpw dns inet "
"unix", NULL) == -1)
err(1, "pledge"); err(1, "pledge");
/* handle some signals */ /* handle some signals */
@ -12480,6 +12478,10 @@ main(int argc, char *argv[])
if ((display = XOpenDisplay(0)) == NULL) if ((display = XOpenDisplay(0)) == NULL)
errx(1, "can not open display"); errx(1, "can not open display");
if (pledge("stdio proc exec cpath rpath wpath fattr getpw",
NULL) == -1)
err(1, "pledge");
conn = XGetXCBConnection(display); conn = XGetXCBConnection(display);
if (xcb_connection_has_error(conn)) if (xcb_connection_has_error(conn))
errx(1, "can not get XCB connection"); errx(1, "can not get XCB connection");
@ -12489,9 +12491,6 @@ main(int argc, char *argv[])
xcb_prefetch_extension_data(conn, &xcb_randr_id); xcb_prefetch_extension_data(conn, &xcb_randr_id);
xfd = xcb_get_file_descriptor(conn); xfd = xcb_get_file_descriptor(conn);
if (pledge("stdio rpath proc exec getpw", NULL) == -1)
err(1, "pledge");
/* look for local and global conf file */ /* look for local and global conf file */
pwd = getpwuid(getuid()); pwd = getpwuid(getuid());
if (pwd == NULL) if (pwd == NULL)
@ -12576,6 +12575,9 @@ noconfig:
if (cfile) if (cfile)
conf_load(cfile, SWM_CONF_DEFAULT); conf_load(cfile, SWM_CONF_DEFAULT);
if (pledge("stdio proc exec cpath rpath wpath fattr", NULL) == -1)
err(1, "pledge");
validate_spawns(); validate_spawns();
if (getenv("SWM_STARTED") == NULL) if (getenv("SWM_STARTED") == NULL)
@ -12587,6 +12589,9 @@ noconfig:
TAILQ_FOREACH(r, &screens[i].rl, entry) TAILQ_FOREACH(r, &screens[i].rl, entry)
bar_setup(r); bar_setup(r);
if (pledge("stdio proc exec", NULL) == -1)
err(1, "pledge");
/* Manage existing windows. */ /* Manage existing windows. */
grab_windows(); grab_windows();
@ -12670,6 +12675,9 @@ noconfig:
xcb_flush(conn); xcb_flush(conn);
} }
done: done:
if (pledge("stdio proc", NULL) == -1)
err(1, "pledge");
shutdown_cleanup(); shutdown_cleanup();
return (0); return (0);