io-util: introduce iovw_append() helper function

diff --git a/src/basic/io-util.c b/src/basic/io-util.c
index 25e551604a7ad52bac97e1d17c20c92852922481..21828d7be8e02ec596a612ace836f925e9736e6c 100644 (file)
--- a/src/basic/io-util.c
+++ b/src/basic/io-util.c
@@ -374,6 +374,43 @@ size_t iovw_size(struct iovec_wrapper *iovw) {
         return n;
 }
 
+int iovw_append(struct iovec_wrapper *target, const struct iovec_wrapper *source) {
+        size_t original_count;
+        int r;
+
+        assert(target);
+
+        /* This duplicates the source and merges it into the target. */
+
+        if (!source || source->count == 0)
+                return 0;
+
+        original_count = target->count;
+
+        FOREACH_ARRAY(iovec, source->iovec, source->count) {
+                void *dup;
+
+                dup = memdup(iovec->iov_base, iovec->iov_len);
+                if (!dup) {
+                        r = -ENOMEM;
+                        goto rollback;
+                }
+
+                r = iovw_consume(target, dup, iovec->iov_len);
+                if (r < 0)
+                        goto rollback;
+        }
+
+        return 0;
+
+rollback:
+        for (size_t i = original_count; i < target->count; i++)
+                free(target->iovec[i].iov_base);
+
+        target->count = original_count;
+        return r;
+}
+
 void iovec_array_free(struct iovec *iov, size_t n) {
         if (!iov)
                 return;

diff --git a/src/basic/io-util.h b/src/basic/io-util.h
index 4f7989e66d3caede52b260def71fdc6f915745c6..6ea2eb20bcf4599c54a13e3d49c907032ad3f6f7 100644 (file)
--- a/src/basic/io-util.h
+++ b/src/basic/io-util.h
@@ -111,5 +111,6 @@ int iovw_put_string_field(struct iovec_wrapper *iovw, const char *field, const c
 int iovw_put_string_field_free(struct iovec_wrapper *iovw, const char *field, char *value);
 void iovw_rebase(struct iovec_wrapper *iovw, char *old, char *new);
 size_t iovw_size(struct iovec_wrapper *iovw);
+int iovw_append(struct iovec_wrapper *target, const struct iovec_wrapper *source);
 
 void iovec_array_free(struct iovec *iov, size_t n);