From 89882306f94fed5c053d4f74ee8379f64c3babcb Mon Sep 17 00:00:00 2001 From: 2xsec Date: Thu, 8 Nov 2018 19:00:19 +0900 Subject: [PATCH] caps: replace read with lxc_read_nointr Signed-off-by: 2xsec --- src/lxc/caps.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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) -- 2.39.2