1 files changed, 4 insertions, 7 deletions

diff --git a/spawn.c b/spawn.c
index 66f5f5e..0a260dc 100644
--- a/spawn.c
+++ b/spawn.c
@@ -189,12 +189,9 @@ static void bfs_spawn_exec(const char *exe, const struct bfs_spawn *ctx, char **
 fail:
 	error = errno;
 
-	while (write(pipefd[1], &error, sizeof(error)) < 0) {
-		if (errno != EINTR) {
-			// Parent will still see that we exited unsuccessfully, but won't know why
-			break;
-		}
-	}
+	// In case of write error parent will still see that we exited
+	// unsuccessfully, but won't know why.
+	(void) safe_write_all(pipefd[1], &error, sizeof(error));
 
 	close(pipefd[1]);
 	_Exit(127);
@@ -224,7 +221,7 @@ pid_t bfs_spawn(const char *exe, const struct bfs_spawn *ctx, char **argv, char
 	// Parent
 	close(pipefd[1]);
 
-	ssize_t nbytes = read(pipefd[0], &error, sizeof(error));
+	ssize_t nbytes = safe_read_all(pipefd[0], &error, sizeof(error));
 	close(pipefd[0]);
 	if (nbytes == sizeof(error)) {
 		int wstatus;