log: handle EINTR in read()

We don't want to link log.{c,h} against utils.{c,h} for the sake of our static builds init.lxc.static. This means lxc_write_nointr() will not be available. So handle it EINTR. Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

log: handle EINTR in read()
e0c19806 · Christian Brauner · a5bc6cb0 · e0c19806
Unverified Commit e0c19806 authored Jul 29, 2018 by Christian Brauner
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

log.c src/lxc/log.c +8 -2

No files found.
--- a/src/lxc/log.c
+++ b/src/lxc/log.c
@@ -290,7 +290,8 @@ static int log_append_logfile(const struct lxc_log_appender *appender,
 {
 	char buffer[LXC_LOG_BUFFER_SIZE];
 	char date_time[LXC_LOG_TIME_SIZE];
-	int n, ret;
+	int n;
+	ssize_t ret;
 	int fd_to_use = -1;
 	const char *log_container_name = log_vmname;

@@ -340,7 +341,12 @@ static int log_append_logfile(const struct lxc_log_appender *appender,

 	buffer[n] = '\n';

-	return write(fd_to_use, buffer, n + 1);
+again:
+	ret = write(fd_to_use, buffer, n + 1);
+	if (ret < 0 && errno == EINTR)
+		goto again;
+
+	return ret;
 }

 static struct lxc_log_appender log_appender_syslog = {