changeset 794:6f8df4842d91

Add a space to $controlN$ substitution and improve documentation.
author Ben Schmidt
date Tue, 22 Feb 2011 10:12:42 +1100
parents 21265d660d19
children 8c4064ce228e
files README.listtexts src/prepstdreply.c
diffstat 2 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/README.listtexts	Mon Mar 07 00:30:58 2011 +1100
+++ b/README.listtexts	Tue Feb 22 10:12:42 2011 +1100
@@ -149,10 +149,10 @@
   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 @@
 
 - $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
--- a/src/prepstdreply.c	Mon Mar 07 00:30:58 2011 +1100
+++ b/src/prepstdreply.c	Tue Feb 22 10:12:42 2011 +1100
@@ -136,8 +136,8 @@
 		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 @@
 			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("");