X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=strv.h;h=f0be83dd59fed7107b4e93a8368824bf7984b921;hp=43a5c5954b8b959a3f29895e5d36a4016d0df713;hb=75db651adba49238a02fe031842155d30e7a8219;hpb=6091827530d6dd43479d6709fb6e9f745c11e900
diff --git a/strv.h b/strv.h
index 43a5c5954..f0be83dd5 100644
--- a/strv.h
+++ b/strv.h
@@ -3,17 +3,61 @@
#ifndef foostrvhfoo
#define foostrvhfoo
+/***
+ This file is part of systemd.
+
+ Copyright 2010 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with systemd; If not, see .
+***/
+
+#include
+#include
+
#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_new(const char *x, ...) __sentinel;
+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;
+
+char *strv_join(char **l, const char *separator) _malloc;
+
+char **strv_env_merge(char **x, ...) _sentinel;
+char **strv_env_delete(char **x, ...) _sentinel;
#define STRV_FOREACH(s, l) \
- for ((s) = (l); (l) && *(s); (s)++)
+ for ((s) = (l); (s) && *(s); (s)++)
#define STRV_FOREACH_BACKWARDS(s, l) \
for (; (l) && ((s) >= (l)); (s)--)