From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 26 Dec 2022 15:29:50 +0000 (+0100)
Subject: Simplify genlistfqdn and add test for it
X-Git-Tag: RELEASE_1_4_0_a2~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aaa3dd369b80e6e34c669fa3e91f38fad70ca93e;p=thirdparty%2Fmlmmj.git

Simplify genlistfqdn and add test for it
---

diff --git a/src/strgen.c b/src/strgen.c
index 83cadc89..4160e1a0 100644
--- a/src/strgen.c
+++ b/src/strgen.c
@@ -68,13 +68,11 @@ char *genlistname(const char *listaddr)
 
 char *genlistfqdn(const char *listaddr)
 {
-	char *dest, *atsign;
+	const char *atsign;
 
 	atsign = strchr(listaddr, '@');
 	MY_ASSERT(atsign);
-	xasprintf(&dest, "%s", atsign + 1);
-
-	return dest;
+	return (xstrdup(atsign + 1));
 }
 
 char *concatstr(int count, ...)
diff --git a/tests/mlmmj.c b/tests/mlmmj.c
index 13674a97..d6239c65 100644
--- a/tests/mlmmj.c
+++ b/tests/mlmmj.c
@@ -77,6 +77,7 @@ ATF_TC_WITHOUT_HEAD(extract_bouncetime);
 ATF_TC_WITHOUT_HEAD(open_subscriber_directory);
 ATF_TC_WITHOUT_HEAD(unsubscribe);
 ATF_TC_WITHOUT_HEAD(genlistname);
+ATF_TC_WITHOUT_HEAD(genlistfqdn);
 
 #ifndef NELEM
 #define NELEM(array)    (sizeof(array) / sizeof((array)[0]))
@@ -934,6 +935,16 @@ ATF_TC_BODY(genlistname, tc)
 	free(ret);
 }
 
+ATF_TC_BODY(genlistfqdn, tc)
+{
+	char *ret;
+
+	ret = genlistfqdn("plop@bla");
+	ATF_REQUIRE_STREQ(ret, "bla");
+	ret = genlistfqdn("plop@bla@meh");
+	ATF_REQUIRE_STREQ(ret, "bla@meh");
+}
+
 ATF_TP_ADD_TCS(tp)
 {
 	ATF_TP_ADD_TC(tp, random_int);
@@ -965,6 +976,7 @@ ATF_TP_ADD_TCS(tp)
 	ATF_TP_ADD_TC(tp, open_subscriber_directory);
 	ATF_TP_ADD_TC(tp, unsubscribe);
 	ATF_TP_ADD_TC(tp, genlistname);
+	ATF_TP_ADD_TC(tp, genlistfqdn);
 
 	return (atf_no_error());
 }