From: 2xsec <dh48.jeong@samsung.com>
Date: Thu, 8 Nov 2018 10:00:19 +0000 (+0900)
Subject: caps: replace read with lxc_read_nointr
X-Git-Tag: lxc-3.0.3~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ede728308a0d1371416a67b664e9b6f566a38b0e;p=thirdparty%2Flxc.git

caps: replace read with lxc_read_nointr

Signed-off-by: 2xsec <dh48.jeong@samsung.com>
---

diff --git a/src/lxc/caps.c b/src/lxc/caps.c
index 2578d3ba4..86baee261 100644
--- a/src/lxc/caps.c
+++ b/src/lxc/caps.c
@@ -33,6 +33,7 @@
 
 #include "caps.h"
 #include "config.h"
+#include "file_utils.h"
 #include "log.h"
 #include "macro.h"
 
@@ -299,11 +300,8 @@ static long int _real_caps_last_cap(void)
 		char *ptr;
 		char buf[INTTYPE_TO_STRLEN(int)] = {0};
 
-	again:
-		n = read(fd, buf, STRARRAYLEN(buf));
-		if (n < 0 && errno == EINTR) {
-			goto again;
-		} else if (n >= 0) {
+		n = lxc_read_nointr(fd, buf, STRARRAYLEN(buf));
+		if (n >= 0) {
 			errno = 0;
 			result = strtol(buf, &ptr, 10);
 			if (!ptr || (*ptr != '\0' && *ptr != '\n') || errno != 0)