util: allow strappenda to take any number of args

This makes strappenda3 redundant, so we remove its usage and
definition. Add a few tests along the way for sanity.

1 files changed, 14 insertions, 0 deletions

diff --git a/src/test/test-util.c b/src/test/test-util.c
index 16f89b471..69e3f5d3a 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -907,6 +907,19 @@ static void test_strshorten(void) {
         assert_se(strlen(strshorten(s, 0)) == 0);
 }
 
+static void test_strappenda(void) {
+        char *actual;
+
+        actual = strappenda("", "foo", "bar");
+        assert_se(streq(actual, "foobar"));
+
+        actual = strappenda("foo", "bar", "baz");
+        assert_se(streq(actual, "foobarbaz"));
+
+        actual = strappenda("foo", "", "bar", "baz");
+        assert_se(streq(actual, "foobarbaz"));
+}
+
 int main(int argc, char *argv[]) {
         log_parse_environment();
         log_open();
@@ -965,6 +978,7 @@ int main(int argc, char *argv[]) {
         test_read_one_char();
         test_ignore_signals();
         test_strshorten();
+        test_strappenda();
 
         return 0;
 }