Add a space to $controlN$ substitution and improve documentation.

--HG--
extra : rebase_source : 2c14815d95e877d972e5092883b507113b35aab8

diff --git a/README.listtexts b/README.listtexts
index 9cc78e1bce6709473fadebfc72a8735fbe424110..d4c9e643b81aee8f1e96540125e455929f8d7bf8 100644 (file)
--- a/README.listtexts
+++ b/README.listtexts
@@ -149,10 +149,10 @@ multi-line substitutions and would not work in a header):
   the address to which to send mail to confirm the (un-)subscription in
   question
 
-- $controlN$
-  the contents of the control file named N, with its final newline stripped; N
-  represents the name of the file to be found in the list's control
-  subdirectory; the name may only include letters and digits
+- $control filename$
+  the contents of the control file named 'filename', with its final newline
+  stripped; 'filename' represents the name of the file to be found in the
+  list's control subdirectory; the name may only include letters and digits
 
 - $digestfirst$
   (available only in digest)
@@ -176,7 +176,7 @@ multi-line substitutions and would not work in a header):
 
 - $digestthreads$
   (available only in digest)
-  the list of threads included in the digest
+  the formatted list of threads included in the digest
 
 - $digestunsubaddr$
   listname+unsubscribe-digest@domain.tld

diff --git a/src/prepstdreply.c b/src/prepstdreply.c
index b8fcd0f78b4a4af260bc310229c79501fae3b2c8..2383a0ced81745af9f0753c99e38d0a12b543338 100644 (file)
--- a/src/prepstdreply.c
+++ b/src/prepstdreply.c
@@ -136,8 +136,8 @@ char *substitute_one(const char *line, const char *listaddr,
                value = concatstr(4, listname, listdelim, "subscribe-nomail@",
                                  fqdn);
                goto concatandreturn;
-       } else if(strncmp(token, "control", 7) == 0) {
-               value = token + 7;
+       } else if(strncmp(token, "control ", 8) == 0) {
+               value = token + 8;
                if(*value == '\0') {
                        value = mystrdup("");
                        goto concatandreturn;
@@ -149,10 +149,10 @@ char *substitute_one(const char *line, const char *listaddr,
                        break;
                }
                if(*value != '\0') {
-                       value = mystrdup(token + 7);
+                       value = mystrdup(token + 8);
                        goto concatandreturn;
                }
-               value = token + 7;
+               value = token + 8;
                value = ctrlcontent(listdir, value);
                if (value == NULL)
                        value = mystrdup("");