X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fstrv.c;fp=src%2Fstrv.c;h=d1c7b2c32d89c31b121fc6ef1c0c719a9167c81c;hp=d9aef982246c0dc158b4a190ce8832a340cfc088;hb=a6ff950e71ea665fff99740f7b3e0137d451a79e;hpb=7fc942b29e7bdb9d6aa3123f53da6680edabd8f0 diff --git a/src/strv.c b/src/strv.c index d9aef9822..d1c7b2c32 100644 --- a/src/strv.c +++ b/src/strv.c @@ -380,7 +380,7 @@ static int env_append(char **r, char ***k, char **a) { /* Add the entries of a to *k unless they already exist in *r * in which case they are overriden instead. This assumes - * there is enough space in the r */ + * there is enough space in the r array. */ for (; *a; a++) { char **j; @@ -556,3 +556,24 @@ char *strv_env_get_with_length(char **l, const char *name, size_t k) { 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; +}