From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 19 Nov 2019 11:29:19 +0000 (+0100)
Subject: copy: port over to flistxattr_malloc() and fgetxattr_malloc()
X-Git-Tag: v244-rc1~6^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9bbb4dcecd4285d44b66308f0892333d0d2f5ad;p=thirdparty%2Fsystemd.git

copy: port over to flistxattr_malloc() and fgetxattr_malloc()
---

diff --git a/src/basic/copy.c b/src/basic/copy.c
index bac321fe683..9028868f696 100644
--- a/src/basic/copy.c
+++ b/src/basic/copy.c
@@ -20,6 +20,7 @@
 #include "macro.h"
 #include "missing_syscall.h"
 #include "mountpoint-util.h"
+#include "nulstr-util.h"
 #include "stat-util.h"
 #include "string-util.h"
 #include "strv.h"
@@ -913,63 +914,28 @@ int copy_times(int fdf, int fdt, CopyFlags flags) {
 }
 
 int copy_xattr(int fdf, int fdt) {
-        _cleanup_free_ char *bufa = NULL, *bufb = NULL;
-        size_t sza = 100, szb = 100;
-        ssize_t n;
-        int ret = 0;
+        _cleanup_free_ char *names = NULL;
+        int ret = 0, r;
         const char *p;
 
-        for (;;) {
-                bufa = malloc(sza);
-                if (!bufa)
-                        return -ENOMEM;
-
-                n = flistxattr(fdf, bufa, sza);
-                if (n == 0)
-                        return 0;
-                if (n > 0)
-                        break;
-                if (errno != ERANGE)
-                        return -errno;
-
-                sza *= 2;
-
-                bufa = mfree(bufa);
-        }
-
-        p = bufa;
-        while (n > 0) {
-                size_t l;
-
-                l = strlen(p);
-                assert(l < (size_t) n);
-
-                if (startswith(p, "user.")) {
-                        ssize_t m;
-
-                        if (!bufb) {
-                                bufb = malloc(szb);
-                                if (!bufb)
-                                        return -ENOMEM;
-                        }
+        r = flistxattr_malloc(fdf, &names);
+        if (r < 0)
+                return r;
 
-                        m = fgetxattr(fdf, p, bufb, szb);
-                        if (m < 0) {
-                                if (errno == ERANGE) {
-                                        szb *= 2;
-                                        bufb = mfree(bufb);
-                                        continue;
-                                }
+        NULSTR_FOREACH(p, names) {
+                _cleanup_free_ char *value = NULL;
 
-                                return -errno;
-                        }
+                if (!startswith(p, "user."))
+                        continue;
 
-                        if (fsetxattr(fdt, p, bufb, m, 0) < 0)
-                                ret = -errno;
-                }
+                r = fgetxattr_malloc(fdf, p, &value);
+                if (r == -ENODATA)
+                        continue; /* gone by now */
+                if (r < 0)
+                        return r;
 
-                p += l + 1;
-                n -= l + 1;
+                if (fsetxattr(fdt, p, value, r, 0) < 0)
+                        ret = -errno;
         }
 
         return ret;