From f74055c90a34cd03c8d6c444aa2d96ddf8d3c746 Mon Sep 17 00:00:00 2001 From: Ken Hornstein Date: Mon, 2 Apr 2012 15:38:40 -0400 Subject: [PATCH] Implement fix in 59b086daa57105e8fbd8b1e6ba60be6a845faf95 here as well. --- uip/mhlsbr.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c index d49314f..faa7f71 100644 --- a/uip/mhlsbr.c +++ b/uip/mhlsbr.c @@ -223,6 +223,22 @@ static struct triple triples[] = { { NULL, 0, 0 } }; +static char *addrcomps[] = { + "from", + "sender", + "reply-to", + "to", + "cc", + "bcc", + "resent-from", + "resent-sender", + "resent-reply-to", + "resent-to", + "resent-cc", + "resent-bcc", + NULL +}; + static int bellflg = 0; static int clearflg = 0; @@ -1907,10 +1923,22 @@ compileargs (struct mcomp *c1, char *nfs) { struct format *fmt; struct arglist *args; + char *ap; + struct comp *cptr; unsigned int i; i = fmt_compile(nfs, &fmt); + /* + * Search through and mark any components that are address components + */ + + for (ap = addrcomps; *ap; ap++) { + FINDCOMP (cptr, *ap); + if (cptr) + cptr->c_type |= CT_ADDR; + } + args = (struct arglist *) mh_xmalloc(sizeof(struct arglist)); if (! args) @@ -1971,9 +1999,7 @@ checkcomp(char *name, char *buf) if (mh_strcasecmp(name, c->c_name) == 0) { found++; if (! c->c_text) { - i = strlen(c->c_text = strdup(buf)) - 1; - if (c->c_text[i] == '\n') - c->c_text[i] = '\0'; + c->c_text = strdup(buf); } else { i = strlen(cp = c->c_text) - 1; if (cp[i] == '\n') { -- 1.7.10.4