apply fgetlistdelim

diff --git a/src/mlmmj-sub.c b/src/mlmmj-sub.c
index c5605590f34e09ee7d25eedb92c621d7fc26315f..a20839e76b3479af256cdef04807c7b11ca6847a 100644 (file)
--- 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 39a6d001933c083fa412a3f1841f8cb042397fef..e3d4e5712028f509f9fd0b4e2aecc9d83891a3e7 100644 (file)
--- 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);