comparison src/send_digest.c @ 742:b00eb39643c1

Changes to how $originalmail$ works - No longer buffer the whole mail in memory, but copy a line at a time - Allow a line-count - Change to the indent/whitespace behaviour; to essentially get current behaviour, a space must be prepended to the lines currently containing $originalmail$ in the listtexts The interface to substitute() and substitute_one() has changed. They no longer take the original mail filename, and cannot be used to do $originalmail$ substitution. This was never used except by prepstdreply() which now incorporates that substitution itself.
author Ben Schmidt
date Mon, 20 Sep 2010 02:05:31 +1000
parents 5db75af2d0db
children ecb991e41a4c
comparison
equal deleted inserted replaced
741:b72bcb7e08a2 742:b00eb39643c1
261 261
262 chomp(line); 262 chomp(line);
263 utfsub = unistr_escaped_to_utf8(line + 9); 263 utfsub = unistr_escaped_to_utf8(line + 9);
264 } 264 }
265 265
266 utfsub2 = substitute(utfsub, listaddr, listdelim, 5, subst_data, NULL); 266 utfsub2 = substitute(utfsub, listaddr, listdelim, 5, subst_data);
267 subject = unistr_utf8_to_header(utfsub2); 267 subject = unistr_utf8_to_header(utfsub2);
268 myfree(utfsub); 268 myfree(utfsub);
269 myfree(utfsub2); 269 myfree(utfsub2);
270 270
271 tmp = concatstr(10, "From: ", listname, listdelim, "help@", listfqdn, 271 tmp = concatstr(10, "From: ", listname, listdelim, "help@", listfqdn,
360 do { 360 do {
361 utfline = unistr_escaped_to_utf8(line); 361 utfline = unistr_escaped_to_utf8(line);
362 myfree(line); 362 myfree(line);
363 363
364 tmp = substitute(utfline, listaddr, listdelim, 364 tmp = substitute(utfline, listaddr, listdelim,
365 5, subst_data, NULL); 365 5, subst_data);
366 myfree(utfline); 366 myfree(utfline);
367 367
368 if(writen(fd, tmp, strlen(tmp)) < 0) { 368 if(writen(fd, tmp, strlen(tmp)) < 0) {
369 myfree(tmp); 369 myfree(tmp);
370 log_error(LOG_ARGS, "Could not write" 370 log_error(LOG_ARGS, "Could not write"