summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/shared/strv.c28
-rw-r--r--src/shared/strv.h3
-rw-r--r--src/test/test-strv.c53
3 files changed, 84 insertions, 0 deletions
diff --git a/src/shared/strv.c b/src/shared/strv.c
index f86dddaf81..e418312d52 100644
--- a/src/shared/strv.c
+++ b/src/shared/strv.c
@@ -524,6 +524,16 @@ char **strv_uniq(char **l) {
return l;
}
+bool strv_is_uniq(char **l) {
+ char **i;
+
+ STRV_FOREACH(i, l)
+ if (strv_find(i+1, *i))
+ return false;
+
+ return true;
+}
+
char **strv_remove(char **l, const char *s) {
char **f, **t;
@@ -664,3 +674,21 @@ int strv_extendf(char ***l, const char *format, ...) {
return strv_consume(l, x);
}
+
+char **strv_reverse(char **l) {
+ unsigned n, i;
+
+ n = strv_length(l);
+ if (n <= 1)
+ return l;
+
+ for (i = 0; i < n / 2; i++) {
+ char *t;
+
+ t = l[i];
+ l[i] = l[n-1-i];
+ l[n-1-i] = t;
+ }
+
+ return l;
+}
diff --git a/src/shared/strv.h b/src/shared/strv.h
index 9e5b1bb8b0..e385bf73b8 100644
--- a/src/shared/strv.h
+++ b/src/shared/strv.h
@@ -52,6 +52,7 @@ int strv_consume_prepend(char ***l, char *value);
char **strv_remove(char **l, const char *s);
char **strv_uniq(char **l);
+bool strv_is_uniq(char **l);
bool strv_equal(char **a, char **b);
@@ -141,3 +142,5 @@ void strv_print(char **l);
_l ++; \
_l[0]; \
}))
+
+char **strv_reverse(char **l);
diff --git a/src/test/test-strv.c b/src/test/test-strv.c
index f343eab7c6..5ae929c3f8 100644
--- a/src/test/test-strv.c
+++ b/src/test/test-strv.c
@@ -491,6 +491,57 @@ static void test_strv_equal(void) {
assert_se(!strv_equal(b, NULL));
}
+static void test_strv_is_uniq(void) {
+ _cleanup_strv_free_ char **a = NULL, **b = NULL, **c = NULL, **d = NULL;
+
+ a = strv_new(NULL, NULL);
+ assert_se(a);
+ assert_se(strv_is_uniq(a));
+
+ b = strv_new("foo", NULL);
+ assert_se(b);
+ assert_se(strv_is_uniq(b));
+
+ c = strv_new("foo", "bar", NULL);
+ assert_se(c);
+ assert_se(strv_is_uniq(c));
+
+ d = strv_new("foo", "bar", "waldo", "bar", "piep", NULL);
+ assert_se(d);
+ assert_se(!strv_is_uniq(d));
+}
+
+static void test_strv_reverse(void) {
+ _cleanup_strv_free_ char **a = NULL, **b = NULL, **c = NULL, **d = NULL;
+
+ a = strv_new(NULL, NULL);
+ assert_se(a);
+
+ strv_reverse(a);
+ assert_se(strv_isempty(a));
+
+ b = strv_new("foo", NULL);
+ assert_se(b);
+ strv_reverse(b);
+ assert_se(streq_ptr(b[0], "foo"));
+ assert_se(streq_ptr(b[1], NULL));
+
+ c = strv_new("foo", "bar", NULL);
+ assert_se(c);
+ strv_reverse(c);
+ assert_se(streq_ptr(c[0], "bar"));
+ assert_se(streq_ptr(c[1], "foo"));
+ assert_se(streq_ptr(c[2], NULL));
+
+ d = strv_new("foo", "bar", "waldo", NULL);
+ assert_se(d);
+ strv_reverse(d);
+ assert_se(streq_ptr(d[0], "waldo"));
+ assert_se(streq_ptr(d[1], "bar"));
+ assert_se(streq_ptr(d[2], "foo"));
+ assert_se(streq_ptr(d[3], NULL));
+}
+
int main(int argc, char *argv[]) {
test_specifier_printf();
test_strv_foreach();
@@ -545,6 +596,8 @@ int main(int argc, char *argv[]) {
test_strv_push_prepend();
test_strv_push();
test_strv_equal();
+ test_strv_is_uniq();
+ test_strv_reverse();
return 0;
}