X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fstrv.c;h=a66369602bbbc98051fbd675628fcfdc1dea47f9;hp=85599fe92c3e0b1e368402fca2d7f1cffc400f5a;hb=f60f22dfbb8cfa0eb55d1896db0e4c3f7d3cfacb;hpb=5b6319dceedd81f3f1ce7eb70ea5defaef43bcec diff --git a/src/strv.c b/src/strv.c index 85599fe92..a66369602 100644 --- a/src/strv.c +++ b/src/strv.c @@ -264,7 +264,7 @@ char **strv_split_quoted(const char *s) { i = 0; FOREACH_WORD_QUOTED(w, l, s, state) - if (!(r[i++] = strndup(w, l))) { + if (!(r[i++] = cunescape_length(w, l))) { strv_free(r); return NULL; } @@ -511,3 +511,31 @@ char **strv_env_delete(char **x, unsigned n_lists, ...) { return r; } + +char **strv_env_set(char **x, const char *p) { + + char **k, **r; + + if (!(r = new(char*, strv_length(x)+2))) + return NULL; + + k = r; + if (env_append(r, &k, x) < 0) + goto fail; + + if (!(*(k++) = strdup(p))) + goto fail; + + *k = NULL; + + return r; + +fail: + for (k--; k >= r; k--) + free(*k); + + free(r); + + return NULL; + +}