From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 2 Nov 2023 08:43:26 +0000 (+0000)
Subject: jail: Use eventfd_read/write convenience handlers
X-Git-Tag: 0.9.30~1313
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a87c52e2819eb7e9af947ed96c51f9b059074924;p=pakfire.git

jail: Use eventfd_read/write convenience handlers

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/jail.c b/src/libpakfire/jail.c
index f59d07d7e..6273dd08a 100644
--- a/src/libpakfire/jail.c
+++ b/src/libpakfire/jail.c
@@ -1575,10 +1575,10 @@ static int pakfire_jail_send_signal(struct pakfire_jail* jail, int fd) {
 	DEBUG(jail->pakfire, "Sending signal...\n");
 
 	// Write to the file descriptor
-	ssize_t bytes_written = write(fd, &val, sizeof(val));
-	if (bytes_written < 0 || (size_t)bytes_written < sizeof(val)) {
-		ERROR(jail->pakfire, "Could not send signal: %m\n");
-		r = 1;
+	r = eventfd_write(fd, val);
+	if (r < 0) {
+		ERROR(jail->pakfire, "Could not send signal: %s\n", strerror(errno));
+		r = -errno;
 	}
 
 	// Close the file descriptor
@@ -1593,10 +1593,10 @@ static int pakfire_jail_wait_for_signal(struct pakfire_jail* jail, int fd) {
 
 	DEBUG(jail->pakfire, "Waiting for signal...\n");
 
-	ssize_t bytes_read = read(fd, &val, sizeof(val));
-	if (bytes_read < 0 || (size_t)bytes_read < sizeof(val)) {
-		ERROR(jail->pakfire, "Error waiting for signal: %m\n");
-		r = 1;
+	r = eventfd_read(fd, &val);
+	if (r < 0) {
+		ERROR(jail->pakfire, "Error waiting for signal: %s\n", strerror(errno));
+		r = -errno;
 	}
 
 	// Close the file descriptor