X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=strv.c;h=a749096f9a35c193ea2d16c36091aac5a26ce33f;hp=b5459a9867175763647adee4302f6e16cfc48cbb;hb=1b322bdb2a147e999c3861cba8a6b3ac0f3b712a;hpb=2e6c9e6bdee8ebc9d34095b6f542603a217498e0

diff --git a/strv.c b/strv.c
index b5459a986..a749096f9 100644
--- a/strv.c
+++ b/strv.c
@@ -85,21 +85,20 @@ unsigned strv_length(char **l) {
         return n;
 }
 
-char **strv_new(const char *x, ...) {
+char **strv_new_ap(const char *x, va_list ap) {
         const char *s;
         char **a;
         unsigned n = 0, i = 0;
-        va_list ap;
+        va_list aq;
+
 
         if (x) {
                 n = 1;
 
-                va_start(ap, x);
-
-                while (va_arg(ap, const char*))
+                va_copy(aq, ap);
+                while (va_arg(aq, const char*))
                         n++;
-
-                va_end(ap);
+                va_end(aq);
         }
 
         if (!(a = new(char*, n+1)))
@@ -113,19 +112,16 @@ char **strv_new(const char *x, ...) {
 
                 i++;
 
-                va_start(ap, x);
-
                 while ((s = va_arg(ap, const char*))) {
                         if (!(a[i] = strdup(s)))
                                 goto fail;
 
                         i++;
                 }
-
-                va_end(ap);
         }
 
         a[i] = NULL;
+
         return a;
 
 fail:
@@ -135,9 +131,21 @@ fail:
                         free(a[i-1]);
 
         free(a);
+
         return NULL;
 }
 
+char **strv_new(const char *x, ...) {
+        char **r;
+        va_list ap;
+
+        va_start(ap, x);
+        r = strv_new_ap(x, ap);
+        va_end(ap);
+
+        return r;
+}
+
 char **strv_merge(char **a, char **b) {
         char **r, **k;
 
@@ -426,3 +434,70 @@ fail:
 
         return NULL;
 }
+
+static bool env_match(const char *t, const char *pattern) {
+        assert(t);
+        assert(pattern);
+
+        /* pattern a matches string a
+         *         a matches a=
+         *         a matches a=b
+         *         a= matches a=
+         *         a=b matches a=b
+         *         a= does not match a
+         *         a=b does not match a=
+         *         a=b does not match a
+         *         a=b does not match a=c */
+
+        if (streq(t, pattern))
+                return true;
+
+        if (!strchr(pattern, '=')) {
+                size_t l = strlen(pattern);
+
+                return strncmp(t, pattern, l) == 0 && t[l] == '=';
+        }
+
+        return false;
+}
+
+char **strv_env_delete(char **x, ...) {
+        size_t n = 0, i = 0;
+        char **l, **k, **r, **j;
+        va_list ap;
+
+        /* Deletes every entry fromx that is mentioned in the other
+         * string lists */
+
+        n = strv_length(x);
+
+        if (!(r = new(char*, n+1)))
+                return NULL;
+
+        STRV_FOREACH(k, x) {
+                va_start(ap, x);
+
+                while ((l = va_arg(ap, char**)))
+                        STRV_FOREACH(j, l)
+                                if (env_match(*k, *j))
+                                        goto delete;
+
+                va_end(ap);
+
+                if (!(r[i++] = strdup(*k))) {
+                        strv_free(r);
+                        return NULL;
+                }
+
+                continue;
+
+        delete:
+                va_end(ap);
+        }
+
+        r[i] = NULL;
+
+        assert(i <= n);
+
+        return r;
+}