diff options
Diffstat (limited to '')
| -rw-r--r-- | dwl.c | 22 |
1 files changed, 22 insertions, 0 deletions
@@ -9,6 +9,7 @@ #include <signal.h> #include <stdio.h> #include <stdlib.h> +#include <sys/resource.h> #include <sys/wait.h> #include <time.h> #include <unistd.h> @@ -368,6 +369,7 @@ static void pointerfocus(Client *c, struct wlr_surface *surface, double sx, double sy, uint32_t time); static void powermgrsetmode(struct wl_listener *listener, void *data); static void quit(const Arg *arg); +static void restorerlimit(void); static void rendermon(struct wl_listener *listener, void *data); static void requestdecorationmode(struct wl_listener *listener, void *data); static void requeststartdrag(struct wl_listener *listener, void *data); @@ -427,6 +429,7 @@ static void swallow(Client *c, Client *w); /* variables */ static const char broken[] = "broken"; +static struct rlimit og_rlimit; static pid_t child_pid = -1; static int locked; static void *exclusive_focus; @@ -2595,6 +2598,15 @@ quit(const Arg *arg) } void +restorerlimit(void) +{ + if (og_rlimit.rlim_cur == 0) + return; + if (setrlimit(RLIMIT_NOFILE, &og_rlimit) < 0) + die("setrlimit:"); +} + +void rendermon(struct wl_listener *listener, void *data) { /* This function is called every time an output is ready to display a frame, @@ -2734,6 +2746,7 @@ run(char *startup_cmd) if ((child_pid = fork()) < 0) die("startup: fork:"); if (child_pid == 0) { + restorerlimit(); close(STDIN_FILENO); setsid(); execl("/bin/sh", "/bin/sh", "-c", startup_cmd, NULL); @@ -2931,10 +2944,18 @@ setsel(struct wl_listener *listener, void *data) void setup(void) { + struct rlimit new_rlimit; int i, sig[] = {SIGCHLD, SIGINT, SIGTERM, SIGPIPE}; struct sigaction sa = {.sa_flags = SA_RESTART, .sa_handler = handlesig}; sigemptyset(&sa.sa_mask); + if (getrlimit(RLIMIT_NOFILE, &og_rlimit) < 0) + die("getrlimit:"); + new_rlimit = og_rlimit; + new_rlimit.rlim_cur = new_rlimit.rlim_max; + if (setrlimit(RLIMIT_NOFILE, &new_rlimit) < 0) + die("setrlimit:"); + for (i = 0; i < (int)LENGTH(sig); i++) sigaction(sig[i], &sa, NULL); @@ -3189,6 +3210,7 @@ void spawn(const Arg *arg) { if (fork() == 0) { + restorerlimit(); close(STDIN_FILENO); dup2(STDERR_FILENO, STDOUT_FILENO); setsid(); |