X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fstrv.c;h=fdb658c0a33696a0e5d644f1c2636748ce0c3a5e;hp=6b76d0eaef57616b11f3aa5f32f29de714236605;hb=98940a3cd93807b5a3809bb1fb7ab43d450939f1;hpb=f274ece0f76b5709408821e317e87aef76123db6

diff --git a/src/shared/strv.c b/src/shared/strv.c
index 6b76d0eae..fdb658c0a 100644
--- a/src/shared/strv.c
+++ b/src/shared/strv.c
@@ -52,6 +52,23 @@ char *strv_find_prefix(char **l, const char *name) {
         return NULL;
 }
 
+char *strv_find_startswith(char **l, const char *name) {
+        char **i, *e;
+
+        assert(name);
+
+        /* Like strv_find_prefix, but actually returns only the
+         * suffix, not the whole item */
+
+        STRV_FOREACH(i, l) {
+                e = startswith(*i, name);
+                if (e)
+                        return e;
+        }
+
+        return NULL;
+}
+
 void strv_free(char **l) {
         char **k;
 
@@ -64,15 +81,7 @@ void strv_free(char **l) {
         free(l);
 }
 
-void strv_freep(char ***l) {
-        if (!l)
-                return;
-
-        strv_free(*l);
-        *l = NULL;
-}
-
-char **strv_copy(char **l) {
+char **strv_copy(char * const *l) {
         char **r, **k;
 
         k = r = new(char*, strv_length(l) + 1);
@@ -92,7 +101,7 @@ char **strv_copy(char **l) {
         return r;
 }
 
-unsigned strv_length(char **l) {
+unsigned strv_length(char * const *l) {
         unsigned n = 0;
 
         if (!l)
@@ -174,77 +183,42 @@ char **strv_new(const char *x, ...) {
         return r;
 }
 
-char **strv_merge(char **a, char **b) {
-        char **r, **k;
-
-        if (!a)
-                return strv_copy(b);
-
-        if (!b)
-                return strv_copy(a);
-
-        r = new(char*, strv_length(a) + strv_length(b) + 1);
-        if (!r)
-                return NULL;
-
-        for (k = r; *a; k++, a++) {
-                *k = strdup(*a);
-                if (!*k)
-                        goto fail;
-        }
+int strv_extend_strv(char ***a, char **b) {
+        int r;
+        char **s;
 
-        for (; *b; k++, b++) {
-                *k = strdup(*b);
-                if (!*k)
-                        goto fail;
+        STRV_FOREACH(s, b) {
+                r = strv_extend(a, *s);
+                if (r < 0)
+                        return r;
         }
 
-        *k = NULL;
-        return r;
-
-fail:
-        strv_free(r);
-        return NULL;
+        return 0;
 }
 
-char **strv_merge_concat(char **a, char **b, const char *suffix) {
-        char **r, **k;
-
-        /* Like strv_merge(), but appends suffix to all strings in b, before adding */
+int strv_extend_strv_concat(char ***a, char **b, const char *suffix) {
+        int r;
+        char **s;
 
-        if (!b)
-                return strv_copy(a);
+        STRV_FOREACH(s, b) {
+                char *v;
 
-        r = new(char*, strv_length(a) + strv_length(b) + 1);
-        if (!r)
-                return NULL;
+                v = strappend(*s, suffix);
+                if (!v)
+                        return -ENOMEM;
 
-        k = r;
-        if (a)
-                for (; *a; k++, a++) {
-                        *k = strdup(*a);
-                        if (!*k)
-                                goto fail;
+                r = strv_push(a, v);
+                if (r < 0) {
+                        free(v);
+                        return r;
                 }
-
-        for (; *b; k++, b++) {
-                *k = strappend(*b, suffix);
-                if (!*k)
-                        goto fail;
         }
 
-        *k = NULL;
-        return r;
-
-fail:
-        strv_free(r);
-        return NULL;
-
+        return 0;
 }
 
 char **strv_split(const char *s, const char *separator) {
-        char *state;
-        char *w;
+        const char *word, *state;
         size_t l;
         unsigned n, i;
         char **r;
@@ -252,7 +226,7 @@ char **strv_split(const char *s, const char *separator) {
         assert(s);
 
         n = 0;
-        FOREACH_WORD_SEPARATOR(w, l, s, separator, state)
+        FOREACH_WORD_SEPARATOR(word, l, s, separator, state)
                 n++;
 
         r = new(char*, n+1);
@@ -260,8 +234,8 @@ char **strv_split(const char *s, const char *separator) {
                 return NULL;
 
         i = 0;
-        FOREACH_WORD_SEPARATOR(w, l, s, separator, state) {
-                r[i] = strndup(w, l);
+        FOREACH_WORD_SEPARATOR(word, l, s, separator, state) {
+                r[i] = strndup(word, l);
                 if (!r[i]) {
                         strv_free(r);
                         return NULL;
@@ -274,35 +248,64 @@ char **strv_split(const char *s, const char *separator) {
         return r;
 }
 
-char **strv_split_quoted(const char *s) {
-        char *state;
-        char *w;
-        size_t l;
-        unsigned n, i;
-        char **r;
+char **strv_split_newlines(const char *s) {
+        char **l;
+        unsigned n;
 
         assert(s);
 
-        n = 0;
-        FOREACH_WORD_QUOTED(w, l, s, state)
-                n++;
+        /* Special version of strv_split() that splits on newlines and
+         * suppresses an empty string at the end */
 
-        r = new(char*, n+1);
-        if (!r)
+        l = strv_split(s, NEWLINE);
+        if (!l)
                 return NULL;
 
-        i = 0;
-        FOREACH_WORD_QUOTED(w, l, s, state) {
-                r[i] = cunescape_length(w, l);
-                if (!r[i]) {
-                        strv_free(r);
-                        return NULL;
-                }
-                i++;
+        n = strv_length(l);
+        if (n <= 0)
+                return l;
+
+        if (isempty(l[n-1])) {
+                free(l[n-1]);
+                l[n-1] = NULL;
         }
 
-        r[i] = NULL;
-        return r;
+        return l;
+}
+
+int strv_split_quoted(char ***t, const char *s, bool relax) {
+        size_t n = 0, allocated = 0;
+        _cleanup_strv_free_ char **l = NULL;
+        int r;
+
+        assert(t);
+        assert(s);
+
+        for (;;) {
+                _cleanup_free_ char *word = NULL;
+
+                r = unquote_first_word(&s, &word, relax);
+                if (r < 0)
+                        return r;
+                if (r == 0)
+                        break;
+
+                if (!GREEDY_REALLOC(l, allocated, n + 2))
+                        return -ENOMEM;
+
+                l[n++] = word;
+                word = NULL;
+
+                l[n] = NULL;
+        }
+
+        if (!l)
+                l = new0(char*, 1);
+
+        *t = l;
+        l = NULL;
+
+        return 0;
 }
 
 char *strv_join(char **l, const char *separator) {
@@ -339,342 +342,204 @@ char *strv_join(char **l, const char *separator) {
         return r;
 }
 
-char **strv_append(char **l, const char *s) {
-        char **r, **k;
-
-        if (!l)
-                return strv_new(s, NULL);
-
-        if (!s)
-                return strv_copy(l);
-
-        r = new(char*, strv_length(l)+2);
-        if (!r)
-                return NULL;
+char *strv_join_quoted(char **l) {
+        char *buf = NULL;
+        char **s;
+        size_t allocated = 0, len = 0;
 
-        for (k = r; *l; k++, l++) {
-                *k = strdup(*l);
-                if (!*k)
-                        goto fail;
+        STRV_FOREACH(s, l) {
+                /* assuming here that escaped string cannot be more
+                 * than twice as long, and reserving space for the
+                 * separator and quotes.
+                 */
+                _cleanup_free_ char *esc = NULL;
+                size_t needed;
+
+                if (!GREEDY_REALLOC(buf, allocated,
+                                    len + strlen(*s) * 2 + 3))
+                        goto oom;
+
+                esc = cescape(*s);
+                if (!esc)
+                        goto oom;
+
+                needed = snprintf(buf + len, allocated - len, "%s\"%s\"",
+                                  len > 0 ? " " : "", esc);
+                assert(needed < allocated - len);
+                len += needed;
         }
 
-        k[0] = strdup(s);
-        if (!k[0])
-                goto fail;
+        if (!buf)
+                buf = malloc0(1);
 
-        k[1] = NULL;
-        return r;
+        return buf;
 
-fail:
-        strv_free(r);
+ oom:
+        free(buf);
         return NULL;
 }
 
-char **strv_uniq(char **l) {
-        char **i;
-
-        /* Drops duplicate entries. The first identical string will be
-         * kept, the others dropped */
-
-        STRV_FOREACH(i, l)
-                strv_remove(i+1, *i);
+int strv_push(char ***l, char *value) {
+        char **c;
+        unsigned n, m;
 
-        return l;
-}
-
-char **strv_remove(char **l, const char *s) {
-        char **f, **t;
-
-        if (!l)
-                return NULL;
-
-        assert(s);
+        if (!value)
+                return 0;
 
-        /* Drops every occurrence of s in the string list, edits
-         * in-place. */
+        n = strv_length(*l);
 
-        for (f = t = l; *f; f++) {
+        /* Increase and check for overflow */
+        m = n + 2;
+        if (m < n)
+                return -ENOMEM;
 
-                if (streq(*f, s)) {
-                        free(*f);
-                        continue;
-                }
+        c = realloc_multiply(*l, sizeof(char*), m);
+        if (!c)
+                return -ENOMEM;
 
-                *(t++) = *f;
-        }
+        c[n] = value;
+        c[n+1] = NULL;
 
-        *t = NULL;
-        return l;
+        *l = c;
+        return 0;
 }
 
-char **strv_remove_prefix(char **l, const char *s) {
-        char **f, **t;
-
-        if (!l)
-                return NULL;
+int strv_push_pair(char ***l, char *a, char *b) {
+        char **c;
+        unsigned n, m;
 
-        assert(s);
+        if (!a && !b)
+                return 0;
 
-        /* Drops every occurrence of a string prefixed with s in the
-         * string list, edits in-place. */
+        n = strv_length(*l);
 
-        for (f = t = l; *f; f++) {
+        /* increase and check for overflow */
+        m = n + !!a + !!b + 1;
+        if (m < n)
+                return -ENOMEM;
 
-                if (startswith(*f, s)) {
-                        free(*f);
-                        continue;
-                }
+        c = realloc_multiply(*l, sizeof(char*), m);
+        if (!c)
+                return -ENOMEM;
 
-                *(t++) = *f;
-        }
+        if (a)
+                c[n++] = a;
+        if (b)
+                c[n++] = b;
+        c[n] = NULL;
 
-        *t = NULL;
-        return l;
+        *l = c;
+        return 0;
 }
 
-static int env_append(char **r, char ***k, char **a) {
-        assert(r);
-        assert(k);
+int strv_push_prepend(char ***l, char *value) {
+        char **c;
+        unsigned n, m, i;
 
-        if (!a)
+        if (!value)
                 return 0;
 
-        /* Add the entries of a to *k unless they already exist in *r
-         * in which case they are overridden instead. This assumes
-         * there is enough space in the r array. */
+        n = strv_length(*l);
 
-        for (; *a; a++) {
-                char **j;
-                size_t n;
+        /* increase and check for overflow */
+        m = n + 2;
+        if (m < n)
+                return -ENOMEM;
 
-                n = strcspn(*a, "=");
+        c = new(char*, m);
+        if (!c)
+                return -ENOMEM;
 
-                if ((*a)[n] == '=')
-                        n++;
-
-                for (j = r; j < *k; j++)
-                        if (strncmp(*j, *a, n) == 0)
-                                break;
+        for (i = 0; i < n; i++)
+                c[i+1] = (*l)[i];
 
-                if (j >= *k)
-                        (*k)++;
-                else
-                        free(*j);
+        c[0] = value;
+        c[n+1] = NULL;
 
-                *j = strdup(*a);
-                if (!*j)
-                        return -ENOMEM;
-        }
+        free(*l);
+        *l = c;
 
         return 0;
 }
 
-char **strv_env_merge(unsigned n_lists, ...) {
-        size_t n = 0;
-        char **l, **k, **r;
-        va_list ap;
-        unsigned i;
-
-        /* Merges an arbitrary number of environment sets */
-
-        va_start(ap, n_lists);
-        for (i = 0; i < n_lists; i++) {
-                l = va_arg(ap, char**);
-                n += strv_length(l);
-        }
-        va_end(ap);
-
-        r = new(char*, n+1);
-        if (!r)
-                return NULL;
-
-        k = r;
-
-        va_start(ap, n_lists);
-        for (i = 0; i < n_lists; i++) {
-                l = va_arg(ap, char**);
-                if (env_append(r, &k, l) < 0)
-                        goto fail;
-        }
-        va_end(ap);
+int strv_consume(char ***l, char *value) {
+        int r;
 
-        *k = NULL;
+        r = strv_push(l, value);
+        if (r < 0)
+                free(value);
 
         return r;
-
-fail:
-        va_end(ap);
-        strv_free(r);
-
-        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 */
+int strv_consume_pair(char ***l, char *a, char *b) {
+        int r;
 
-        if (streq(t, pattern))
-                return true;
-
-        if (!strchr(pattern, '=')) {
-                size_t l = strlen(pattern);
-
-                return strncmp(t, pattern, l) == 0 && t[l] == '=';
+        r = strv_push_pair(l, a, b);
+        if (r < 0) {
+                free(a);
+                free(b);
         }
 
-        return false;
+        return r;
 }
 
-char **strv_env_delete(char **x, unsigned n_lists, ...) {
-        size_t n, i = 0;
-        char **k, **r;
-        va_list ap;
-
-        /* Deletes every entry from x that is mentioned in the other
-         * string lists */
+int strv_consume_prepend(char ***l, char *value) {
+        int r;
 
-        n = strv_length(x);
-
-        r = new(char*, n+1);
-        if (!r)
-                return NULL;
+        r = strv_push_prepend(l, value);
+        if (r < 0)
+                free(value);
 
-        STRV_FOREACH(k, x) {
-                unsigned v;
+        return r;
+}
 
-                va_start(ap, n_lists);
-                for (v = 0; v < n_lists; v++) {
-                        char **l, **j;
+int strv_extend(char ***l, const char *value) {
+        char *v;
 
-                        l = va_arg(ap, char**);
-                        STRV_FOREACH(j, l)
-                                if (env_match(*k, *j))
-                                        goto skip;
-                }
-                va_end(ap);
+        if (!value)
+                return 0;
 
-                r[i] = strdup(*k);
-                if (!r[i]) {
-                        strv_free(r);
-                        return NULL;
-                }
+        v = strdup(value);
+        if (!v)
+                return -ENOMEM;
 
-                i++;
-                continue;
+        return strv_consume(l, v);
+}
 
-        skip:
-                va_end(ap);
-        }
+char **strv_uniq(char **l) {
+        char **i;
 
-        r[i] = NULL;
+        /* Drops duplicate entries. The first identical string will be
+         * kept, the others dropped */
 
-        assert(i <= n);
+        STRV_FOREACH(i, l)
+                strv_remove(i+1, *i);
 
-        return r;
+        return l;
 }
 
-char **strv_env_unset(char **l, const char *p) {
-
+char **strv_remove(char **l, const char *s) {
         char **f, **t;
 
         if (!l)
                 return NULL;
 
-        assert(p);
-
-        /* Drops every occurrence of the env var setting p in the
-         * string list. edits in-place. */
+        assert(s);
 
-        for (f = t = l; *f; f++) {
+        /* Drops every occurrence of s in the string list, edits
+         * in-place. */
 
-                if (env_match(*f, p)) {
+        for (f = t = l; *f; f++)
+                if (streq(*f, s))
                         free(*f);
-                        continue;
-                }
-
-                *(t++) = *f;
-        }
+                else
+                        *(t++) = *f;
 
         *t = NULL;
         return l;
 }
 
-char **strv_env_set(char **x, const char *p) {
-
-        char **k, **r;
-        char* m[2] = { (char*) p, NULL };
-
-        /* Overrides the env var setting of p, returns a new copy */
-
-        r = new(char*, strv_length(x)+2);
-        if (!r)
-                return NULL;
-
-        k = r;
-        if (env_append(r, &k, x) < 0)
-                goto fail;
-
-        if (env_append(r, &k, m) < 0)
-                goto fail;
-
-        *k = NULL;
-
-        return r;
-
-fail:
-        strv_free(r);
-        return NULL;
-
-}
-
-char *strv_env_get_with_length(char **l, const char *name, size_t k) {
-        char **i;
-
-        assert(name);
-
-        STRV_FOREACH(i, l)
-                if (strncmp(*i, name, k) == 0 &&
-                    (*i)[k] == '=')
-                        return *i + k + 1;
-
-        return NULL;
-}
-
-char *strv_env_get(char **l, const char *name) {
-        return strv_env_get_with_length(l, name, strlen(name));
-}
-
-char **strv_env_clean(char **l) {
-        char **r, **ret;
-
-        for (r = ret = l; *l; l++) {
-                const char *equal;
-
-                equal = strchr(*l, '=');
-
-                if (equal && equal[1] == 0) {
-                        free(*l);
-                        continue;
-                }
-
-                *(r++) = *l;
-        }
-
-        *r = NULL;
-
-        return ret;
-}
-
 char **strv_parse_nulstr(const char *s, size_t l) {
         const char *p;
         unsigned c = 0, i = 0;
@@ -683,7 +548,7 @@ char **strv_parse_nulstr(const char *s, size_t l) {
         assert(s || l <= 0);
 
         if (l <= 0)
-                return strv_new(NULL, NULL);
+                return new0(char*, 1);
 
         for (p = s; p < s + l; p++)
                 if (*p == 0)
@@ -721,15 +586,28 @@ char **strv_parse_nulstr(const char *s, size_t l) {
         return v;
 }
 
-bool strv_overlap(char **a, char **b) {
-        char **i, **j;
+char **strv_split_nulstr(const char *s) {
+        const char *i;
+        char **r = NULL;
 
-        STRV_FOREACH(i, a) {
-                STRV_FOREACH(j, b) {
-                        if (streq(*i, *j))
-                                return true;
+        NULSTR_FOREACH(i, s)
+                if (strv_extend(&r, i) < 0) {
+                        strv_free(r);
+                        return NULL;
                 }
-        }
+
+        if (!r)
+                return strv_new(NULL, NULL);
+
+        return r;
+}
+
+bool strv_overlap(char **a, char **b) {
+        char **i;
+
+        STRV_FOREACH(i, a)
+                if (strv_contains(b, *i))
+                        return true;
 
         return false;
 }
@@ -748,3 +626,36 @@ char **strv_sort(char **l) {
         qsort(l, strv_length(l), sizeof(char*), str_compare);
         return l;
 }
+
+bool strv_equal(char **a, char **b) {
+        if (!a || !b)
+                return a == b;
+
+        for ( ; *a || *b; ++a, ++b)
+                if (!streq_ptr(*a, *b))
+                        return false;
+
+        return true;
+}
+
+void strv_print(char **l) {
+        char **s;
+
+        STRV_FOREACH(s, l)
+                puts(*s);
+}
+
+int strv_extendf(char ***l, const char *format, ...) {
+        va_list ap;
+        char *x;
+        int r;
+
+        va_start(ap, format);
+        r = vasprintf(&x, format, ap);
+        va_end(ap);
+
+        if (r < 0)
+                return -ENOMEM;
+
+        return strv_consume(l, x);
+}