1 files changed, 8 insertions, 13 deletions

diff --git a/sway/swaynag.c b/sway/swaynag.c
index db5a919a..bc5e23ea 100644
--- a/sway/swaynag.c
+++ b/sway/swaynag.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <signal.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -64,6 +63,8 @@ bool swaynag_spawn(const char *swaynag_command,
                 sway_log(SWAY_ERROR, "Failed to create fork for swaynag");
                 goto failed;
         } else if (pid == 0) {
+                restore_nofile_limit();
+
                 pid = fork();
                 if (pid < 0) {
                         sway_log_errno(SWAY_ERROR, "fork failed");
@@ -87,8 +88,8 @@ bool swaynag_spawn(const char *swaynag_command,
                         size_t length = strlen(swaynag_command) + strlen(swaynag->args) + 2;
                         char *cmd = malloc(length);
                         snprintf(cmd, length, "%s %s", swaynag_command, swaynag->args);
-                        execl("/bin/sh", "/bin/sh", "-c", cmd, NULL);
-                        sway_log_errno(SWAY_ERROR, "execl failed");
+                        execlp("sh", "sh", "-c", cmd, NULL);
+                        sway_log_errno(SWAY_ERROR, "execlp failed");
                         _exit(EXIT_FAILURE);
                 }
                 _exit(EXIT_SUCCESS);
@@ -143,22 +144,16 @@ void swaynag_log(const char *swaynag_command, struct swaynag_instance *swaynag,
 
         va_list args;
         va_start(args, fmt);
-        size_t length = vsnprintf(NULL, 0, fmt, args) + 1;
+        char *str = vformat_str(fmt, args);
         va_end(args);
-
-        char *temp = malloc(length + 1);
-        if (!temp) {
+        if (!str) {
                 sway_log(SWAY_ERROR, "Failed to allocate buffer for swaynag log entry.");
                 return;
         }
 
-        va_start(args, fmt);
-        vsnprintf(temp, length, fmt, args);
-        va_end(args);
-
-        write(swaynag->fd[1], temp, length);
+        write(swaynag->fd[1], str, strlen(str));
 
-        free(temp);
+        free(str);
 }
 
 void swaynag_show(struct swaynag_instance *swaynag) {