From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 26 Dec 2022 15:57:06 +0000 (+0100)
Subject: apply fgetlistdelim
X-Git-Tag: RELEASE_1_4_0_a2~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8c8fc8d2dd4d7ebfc5b73ea92f25e485a4b3881;p=thirdparty%2Fmlmmj.git

apply fgetlistdelim
---

diff --git a/src/mlmmj-sub.c b/src/mlmmj-sub.c
index c5605590..a20839e7 100644
--- a/src/mlmmj-sub.c
+++ b/src/mlmmj-sub.c
@@ -128,7 +128,6 @@ static void moderate_sub(const char *listdir, const char *listaddr,
 	}
 
 	/* send mail to moderators about request pending */
-	listdelim = getlistdelim(listdir);
 	listfqdn = genlistfqdn(listaddr);
 	listname = genlistname(listaddr);
 
@@ -500,17 +499,16 @@ static void print_help(const char *prg)
 }
 
 void generate_subscribed(const char *listdir, const char *subaddr,
-		const char *mlmmjsend, enum subtype typesub, const char *listaddr)
+    const char *mlmmjsend, enum subtype typesub, const char *listaddr,
+    const char *listdelim)
 {
 	text *txt;
 	char *queuefilename, *fromaddr, *listname, *listfqdn;
-	char *listdelim = getlistdelim(listdir);
 
 	listname = genlistname(listaddr);
 	listfqdn = genlistfqdn(listaddr);
 
 	fromaddr = concatstr(4, listname, listdelim, "bounces-help@", listfqdn);
-	free(listdelim);
 
 	txt = open_text(listdir,
 			"deny", "sub", "subbed", subtype_strs[typesub],
@@ -705,7 +703,7 @@ int main(int argc, char **argv)
 	if(subbed == typesub) {
 		if(!nogensubscribed)
 			generate_subscribed(listdir, address, mlmmjsend,
-					typesub, listaddr);
+			    typesub, listaddr, listdelim);
 		return EXIT_SUCCESS;
 	} else if(subbed != SUB_NONE) {
 		reasonsub = SUB_SWITCH;
@@ -724,7 +722,7 @@ int main(int argc, char **argv)
 		}
 	}
 
-	listdelim = getlistdelim(listdir);
+	listdelim = fgetlistdelim(ctrlfd);
 
 	if(subbed == SUB_NONE && subconfirm)
 			generate_subconfirm(listdir, listaddr, listdelim,
diff --git a/src/mlmmj-unsub.c b/src/mlmmj-unsub.c
index 39a6d001..e3d4e571 100644
--- a/src/mlmmj-unsub.c
+++ b/src/mlmmj-unsub.c
@@ -253,17 +253,16 @@ static void print_help(const char *prg)
 }
 
 static void generate_notsubscribed(const char *listdir, const char *subaddr,
-	const char *mlmmjsend, enum subtype typesub, const char *listaddr)
+	const char *mlmmjsend, enum subtype typesub, const char *listaddr,
+	const char *listdelim)
 {
 	text *txt;
 	char *queuefilename, *fromaddr, *listname, *listfqdn;
-	char *listdelim = getlistdelim(listdir);
 
 	listname = genlistname(listaddr);
 	listfqdn = genlistfqdn(listaddr);
 
 	fromaddr = concatstr(4, listname, listdelim, "bounces-help@", listfqdn);
-	free(listdelim);
 
 	txt = open_text(listdir,
 			"deny", "unsub", "unsubbed", subtype_strs[typesub],
@@ -391,7 +390,7 @@ int main(int argc, char **argv)
 	/* Make the address lowercase */
 	address = lowercase(address);
 	listaddr = fgetlistaddr(ctrlfd);
-	listdelim = getlistdelim(listdir);
+	listdelim = fgetlistdelim(ctrlfd);
 
 	if(changeuid) {
 		uid = getuid();
@@ -424,7 +423,7 @@ int main(int argc, char **argv)
 		/* Address is not subscribed */
 		if(!nogennotsubscribed) {
 			generate_notsubscribed(listdir, address, mlmmjsend,
-			    typesub, listaddr);
+			    typesub, listaddr, listdelim);
 		}
 
 		exit(EXIT_SUCCESS);