Mercurial > hg > mlmmj
comparison src/mlmmj-sub.c @ 741:b72bcb7e08a2
Arbitrary headers in listtexts, fix default Content-Transfer-Encoding: header,
and document \uNNNN substitution
Also, the interface to prepstdreply() has changed; there is no longer a
customheaders argument, which was never used anyway, and is now essentially
redundant due to this patch.
author | Ben Schmidt |
---|---|
date | Mon, 20 Sep 2010 01:44:58 +1000 |
parents | e5286b45f9ca |
children | c7d0a386aef5 |
comparison
equal
deleted
inserted
replaced
740:5db75af2d0db | 741:b72bcb7e08a2 |
---|---|
145 maildata[1] = mystrdup(subaddr); | 145 maildata[1] = mystrdup(subaddr); |
146 maildata[3] = replyto; | 146 maildata[3] = replyto; |
147 maildata[5] = moderators; | 147 maildata[5] = moderators; |
148 | 148 |
149 queuefilename = prepstdreply(listdir, "submod-moderator", | 149 queuefilename = prepstdreply(listdir, "submod-moderator", |
150 "$listowner$", to, replyto, 3, maildata, NULL, NULL); | 150 "$listowner$", to, replyto, 3, maildata, NULL); |
151 | 151 |
152 myfree(maildata[1]); | 152 myfree(maildata[1]); |
153 | 153 |
154 /* we might need to exec more than one mlmmj-send */ | 154 /* we might need to exec more than one mlmmj-send */ |
155 | 155 |
187 | 187 |
188 /* send mail to requester that the list is submod'ed */ | 188 /* send mail to requester that the list is submod'ed */ |
189 | 189 |
190 from = concatstr(4, listname, listdelim, "bounces-help@", listfqdn); | 190 from = concatstr(4, listname, listdelim, "bounces-help@", listfqdn); |
191 queuefilename = prepstdreply(listdir, "submod-requester", "$listowner$", | 191 queuefilename = prepstdreply(listdir, "submod-requester", "$listowner$", |
192 subaddr, NULL, 0, NULL, NULL, NULL); | 192 subaddr, NULL, 0, NULL, NULL); |
193 | 193 |
194 myfree(listname); | 194 myfree(listname); |
195 myfree(listfqdn); | 195 myfree(listfqdn); |
196 execl(mlmmjsend, mlmmjsend, | 196 execl(mlmmjsend, mlmmjsend, |
197 "-l", "1", | 197 "-l", "1", |
280 listtext = mystrdup("sub-ok-nomail"); | 280 listtext = mystrdup("sub-ok-nomail"); |
281 break; | 281 break; |
282 } | 282 } |
283 | 283 |
284 queuefilename = prepstdreply(listdir, listtext, "$helpaddr$", | 284 queuefilename = prepstdreply(listdir, listtext, "$helpaddr$", |
285 subaddr, NULL, 0, NULL, NULL, NULL); | 285 subaddr, NULL, 0, NULL, NULL); |
286 MY_ASSERT(queuefilename); | 286 MY_ASSERT(queuefilename); |
287 myfree(listtext); | 287 myfree(listtext); |
288 | 288 |
289 execlp(mlmmjsend, mlmmjsend, | 289 execlp(mlmmjsend, mlmmjsend, |
290 "-l", "1", | 290 "-l", "1", |
327 listtext = mystrdup("notifysub-nomail"); | 327 listtext = mystrdup("notifysub-nomail"); |
328 break; | 328 break; |
329 } | 329 } |
330 | 330 |
331 queuefilename = prepstdreply(listdir, listtext, "$listowner$", | 331 queuefilename = prepstdreply(listdir, listtext, "$listowner$", |
332 "$listowner$", NULL, 1, maildata, NULL, NULL); | 332 "$listowner$", NULL, 1, maildata, NULL); |
333 MY_ASSERT(queuefilename) | 333 MY_ASSERT(queuefilename) |
334 myfree(listtext); | 334 myfree(listtext); |
335 myfree(maildata[1]); | 335 myfree(maildata[1]); |
336 execlp(mlmmjsend, mlmmjsend, | 336 execlp(mlmmjsend, mlmmjsend, |
337 "-l", "1", | 337 "-l", "1", |
414 | 414 |
415 maildata[1] = mystrdup(subaddr); | 415 maildata[1] = mystrdup(subaddr); |
416 maildata[3] = mystrdup(confirmaddr); | 416 maildata[3] = mystrdup(confirmaddr); |
417 | 417 |
418 queuefilename = prepstdreply(listdir, listtext, "$helpaddr$", subaddr, | 418 queuefilename = prepstdreply(listdir, listtext, "$helpaddr$", subaddr, |
419 confirmaddr, 2, maildata, NULL, NULL); | 419 confirmaddr, 2, maildata, NULL); |
420 | 420 |
421 myfree(maildata[1]); | 421 myfree(maildata[1]); |
422 myfree(maildata[3]); | 422 myfree(maildata[3]); |
423 | 423 |
424 myfree(listname); | 424 myfree(listname); |
467 | 467 |
468 fromaddr = concatstr(4, listname, listdelim, "bounces-help@", listfqdn); | 468 fromaddr = concatstr(4, listname, listdelim, "bounces-help@", listfqdn); |
469 myfree(listdelim); | 469 myfree(listdelim); |
470 | 470 |
471 queuefilename = prepstdreply(listdir, "sub-subscribed", "$helpaddr$", | 471 queuefilename = prepstdreply(listdir, "sub-subscribed", "$helpaddr$", |
472 subaddr, NULL, 0, NULL, NULL, NULL); | 472 subaddr, NULL, 0, NULL, NULL); |
473 MY_ASSERT(queuefilename); | 473 MY_ASSERT(queuefilename); |
474 | 474 |
475 myfree(listaddr); | 475 myfree(listaddr); |
476 myfree(listname); | 476 myfree(listname); |
477 myfree(listfqdn); | 477 myfree(listfqdn); |