X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=strv.c;h=faa878c006748c0e0fc21f4c7ea004636224c73f;hb=6632c6023c5f90e15440231500d3431e869e4577;hp=ecad6d59806b880e923df900511c26ae662e1c17;hpb=6091827530d6dd43479d6709fb6e9f745c11e900;p=elogind.git

diff --git a/strv.c b/strv.c
index ecad6d598..faa878c00 100644
--- a/strv.c
+++ b/strv.c
@@ -115,3 +115,33 @@ fail:
         free(a);
         return NULL;
 }
+
+char **strv_merge(char **a, char **b) {
+        char **r, **k;
+
+        if (!a)
+                return strv_copy(b);
+
+        if (!b)
+                return strv_copy(a);
+
+        if (!(r = new(char*, strv_length(a)+strv_length(b)+1)))
+                return NULL;
+
+        for (k = r; *a; k++, a++)
+                if (!(*k = strdup(*a)))
+                        goto fail;
+        for (; *b; k++, b++)
+                if (!(*k = strdup(*b)))
+                        goto fail;
+
+        *k = NULL;
+        return r;
+
+fail:
+        for (k--; k >= r; k--)
+                free(*k);
+
+        return NULL;
+
+}