X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=strv.h;h=f0be83dd59fed7107b4e93a8368824bf7984b921;hp=7a132ef68779de0f5b52c3ffb02adbc379556f84;hb=cb8a8f78a11cedb8cba1abfa9a63b0d3ea8eef93;hpb=a65d570117dc73a3af5084319b645ab1556562e5

diff --git a/strv.h b/strv.h
index 7a132ef68..f0be83dd5 100644
--- a/strv.h
+++ b/strv.h
@@ -22,18 +22,39 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <stdarg.h>
+#include <stdbool.h>
+
 #include "macro.h"
 
 char *strv_find(char **l, const char *name);
 void strv_free(char **l);
-char **strv_copy(char **l);
+char **strv_copy(char **l) _malloc;
 unsigned strv_length(char **l);
 
 char **strv_merge(char **a, char **b);
+char **strv_merge_concat(char **a, char **b, const char *suffix);
+char **strv_append(char **l, const char *s);
+
+char **strv_remove(char **l, const char *s);
+char **strv_uniq(char **l);
+
+#define strv_contains(l, s) (!!strv_find((l), (s)))
+
+char **strv_new(const char *x, ...) _sentinel _malloc;
+char **strv_new_ap(const char *x, va_list ap) _malloc;
+
+static inline bool strv_isempty(char **l) {
+        return !l || !*l;
+}
+
+char **strv_split(const char *s, const char *separator) _malloc;
+char **strv_split_quoted(const char *s) _malloc;
 
-bool strv_contains(char **l, const char *s);
+char *strv_join(char **l, const char *separator) _malloc;
 
-char **strv_new(const char *x, ...) _sentinel;
+char **strv_env_merge(char **x, ...) _sentinel;
+char **strv_env_delete(char **x, ...) _sentinel;
 
 #define STRV_FOREACH(s, l)                      \
         for ((s) = (l); (s) && *(s); (s)++)