]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
caps: replace read with lxc_read_nointr
author2xsec <dh48.jeong@samsung.com>
Thu, 8 Nov 2018 10:00:19 +0000 (19:00 +0900)
committer2xsec <dh48.jeong@samsung.com>
Thu, 8 Nov 2018 10:00:19 +0000 (19:00 +0900)
Signed-off-by: 2xsec <dh48.jeong@samsung.com>
src/lxc/caps.c

index 2578d3ba499eb5c4735c17aca4c91e9addcead9d..86baee26190310569b9b2985da157502d034022a 100644 (file)
@@ -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)