From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 2 Nov 2021 13:52:16 +0000 (+0100)
Subject: cleanup: replace some concatstr with standard asprintf
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d72d1c8115ebbb3b012bfbc55e85a342441f535;p=thirdparty%2Fmlmmj.git

cleanup: replace some concatstr with standard asprintf
---

diff --git a/src/prepstdreply.c b/src/prepstdreply.c
index ab5ea5a0..436df648 100644
--- a/src/prepstdreply.c
+++ b/src/prepstdreply.c
@@ -324,6 +324,7 @@ static char *numeric_token(char *token)
 	return token;
 }
 
+#define cmd_mail(val, str, list) myasprintf(val, "%s%s"str"%s", list->name, list->delim, list->fqdn)
 
 static void substitute_one(char **line_p, char **pos_p, int *width_p,
 		struct mlmmj_list *list, text *txt)
@@ -355,45 +356,41 @@ static void substitute_one(char **line_p, char **pos_p, int *width_p,
 		/* DEPRECATED: use $list$@$domain$ instead */
 		value = mystrdup(list->addr);
 	} else if(strcmp(token, "list+") == 0) {
-		value = concatstr(2, list->name, list->delim);
+		myasprintf(&value, "%s%s", list->name, list->delim);
 	} else if(strcmp(token, "list") == 0) {
 		value = mystrdup(list->name);
 	} else if(strcmp(token, "domain") == 0) {
 		value = mystrdup(list->fqdn);
 	} else if(strcmp(token, "listowner") == 0) {
 		/* DEPRECATED: use $list+$owner@$domain$ instead */
-		value = concatstr(4, list->name, list->delim, "owner@", list->fqdn);
+		cmd_mail(&value, "owner@", list);
 	} else if(strcmp(token, "helpaddr") == 0) {
 		/* DEPRECATED: use $list+$help@$domain$ instead */
-		value = concatstr(4, list->name, list->delim, "help@", list->fqdn);
+		cmd_mail(&value, "help@", list);
 	} else if(strcmp(token, "faqaddr") == 0) {
 		/* DEPRECATED: use $list+$faq@$domain$ instead */
-		value = concatstr(4, list->name, list->delim, "faq@", list->fqdn);
+		cmd_mail(&value, "faq@", list);
 	} else if(strcmp(token, "listgetN") == 0) {
 		/* DEPRECATED: use $list+$get-N@$domain$ instead */
-		value = concatstr(4, list->name, list->delim, "get-N@", list->fqdn);
+		cmd_mail(&value, "get-N@", list);
 	} else if(strcmp(token, "listunsubaddr") == 0) {
 		/* DEPRECATED: use $list+$unsubscribe@$domain$ instead */
-		value = concatstr(4, list->name, list->delim, "unsubscribe@", list->fqdn);
+		cmd_mail(&value, "unsubscribe@", list);
 	} else if(strcmp(token, "digestunsubaddr") == 0) {
 		/* DEPRECATED: use $list+$unsubscribe-digest@$domain$ instead */
-		value = concatstr(4, list->name, list->delim,
-				  "unsubscribe-digest@", list->fqdn);
+		cmd_mail(&value, "unsubscribe-digest@", list);
 	} else if(strcmp(token, "nomailunsubaddr") == 0) {
 		/* DEPRECATED: use $list+$unsubscribe-nomail@$domain$ instead */
-		value = concatstr(4, list->name, list->delim,
-				  "unsubscribe-nomail@", list->fqdn);
+		cmd_mail(&value, "unsubscribe-nomail@", list);
 	} else if(strcmp(token, "listsubaddr") == 0) {
 		/* DEPRECATED: use $list+$subscribe@$domain$ instead */
-		value = concatstr(4, list->name, list->delim, "subscribe@", list->fqdn);
+		cmd_mail(&value, "subscribe@", list);
 	} else if(strcmp(token, "digestsubaddr") == 0) {
 		/* DEPRECATED: use $list+$subscribe-digest@$domain$ instead */
-		value = concatstr(4, list->name, list->delim, "subscribe-digest@",
-				  list->fqdn);
+		cmd_mail(&value, "subscribe-digest@", list);
 	} else if(strcmp(token, "nomailsubaddr") == 0) {
 		/* DEPRECATED: use $list+$subscribe-nomail@$domain$ instead */
-		value = concatstr(4, list->name, list->delim, "subscribe-nomail@",
-				  list->fqdn);
+		cmd_mail(&value, "subscribe-nomail@", list);
 	} else if(strncmp(token, "control ", 8) == 0) {
 		token = filename_token(token + 8);
 		if (token != NULL) value = ctrlcontent(list, token);