projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Teach spost to handle address groups
[mmh]
/
uip
/
spost.c
diff --git
a/uip/spost.c
b/uip/spost.c
index
3a70f36
..
7729e9b
100644
(file)
--- a/
uip/spost.c
+++ b/
uip/spost.c
@@
-49,6
+49,7
@@
static struct swit switches[] = {
#define HBCC 0x0010 /* don't output this header */
#define HFCC 0x0020 /* FCC: type header */
#define HIGN 0x0040 /* ignore this header */
#define HBCC 0x0010 /* don't output this header */
#define HFCC 0x0020 /* FCC: type header */
#define HIGN 0x0040 /* ignore this header */
+#define HDCC 0x0080 /* DCC: type header */
/* flags for headers->set */
#define MFRM 0x0001 /* we've seen a From: */
/* flags for headers->set */
#define MFRM 0x0001 /* we've seen a From: */
@@
-75,6
+76,7
@@
static struct headers NHeaders[] = {
{ "Subject", HSUB, 0 },
{ "To", HADR|HTRY, MVIS },
{ "Cc", HADR|HTRY, MVIS },
{ "Subject", HSUB, 0 },
{ "To", HADR|HTRY, MVIS },
{ "Cc", HADR|HTRY, MVIS },
+ { "Dcc", HADR|HTRY|HDCC, MINV },
{ "Bcc", HADR|HTRY|HBCC, MINV },
{ "Message-Id", HBAD, 0 },
{ "Fcc", HFCC, 0 },
{ "Bcc", HADR|HTRY|HBCC, MINV },
{ "Message-Id", HBAD, 0 },
{ "Fcc", HFCC, 0 },
@@
-90,6
+92,7
@@
static struct headers RHeaders[] = {
{ "Resent-Subject", HSUB, 0 },
{ "Resent-To", HADR|HTRY, MVIS },
{ "Resent-Cc", HADR|HTRY, MVIS },
{ "Resent-Subject", HSUB, 0 },
{ "Resent-To", HADR|HTRY, MVIS },
{ "Resent-Cc", HADR|HTRY, MVIS },
+ { "Resent-Dcc", HADR|HTRY|HDCC, MINV },
{ "Resent-Bcc", HADR|HTRY|HBCC, MINV },
{ "Resent-Message-Id", HBAD, 0 },
{ "Resent-Fcc", HFCC, 0 },
{ "Resent-Bcc", HADR|HTRY|HBCC, MINV },
{ "Resent-Message-Id", HBAD, 0 },
{ "Resent-Fcc", HFCC, 0 },
@@
-354,7
+357,8
@@
putfmt(char *name, char *str, FILE *out)
int i;
struct headers *hdr;
struct mailname addr_start, *addr_end;
int i;
struct headers *hdr;
struct mailname addr_start, *addr_end;
- size_t addrc;
+ size_t addrc = 0;
+ ssize_t ret;
addr_end = &addr_start;
addr_end->m_next = NULL;
addr_end = &addr_start;
addr_end->m_next = NULL;
@@
-408,7
+412,11
@@
putfmt(char *name, char *str, FILE *out)
return;
}
return;
}
- addrc = getmboxes(str, &addr_end);
+ if ((ret = getmboxes(str, &addr_end)) < 0) {
+ adios(EX_DATAERR, NULL, "can't parse address: %s", str);
+ }
+
+ addrc += ret;
if (aliasflg) {
addrc += do_aliasing(&addr_start, &addr_end);
if (aliasflg) {
addrc += do_aliasing(&addr_start, &addr_end);
@@
-423,7
+431,6
@@
putfmt(char *name, char *str, FILE *out)
if (hdr->set & MFRM) {
struct mailname *mp = NULL;
struct mailname *my = NULL;
if (hdr->set & MFRM) {
struct mailname *mp = NULL;
struct mailname *my = NULL;
- unsigned int fromcnt = 0;
/* needed because the address parser holds global state */
ismymbox(NULL);
/* needed because the address parser holds global state */
ismymbox(NULL);
@@
-435,15
+442,16
@@
putfmt(char *name, char *str, FILE *out)
my = mp;
}
}
my = mp;
}
}
- fromcnt++;
}
}
- if (fromcnt > 1) {
+ if (addrc > 1) {
sender = my;
}
}
sender = my;
}
}
- putadr(name, addr_start.m_next);
+ if (!(hdr->flags & HDCC)) {
+ putadr(name, addr_start.m_next);
+ }
if (hdr->flags & HTRY) {
addr_end->m_next = recipients;
if (hdr->flags & HTRY) {
addr_end->m_next = recipients;
@@
-526,7
+534,8
@@
get_header(char *header, struct headers *table)
static void
putadr(char *name, struct mailname *nl)
{
static void
putadr(char *name, struct mailname *nl)
{
- struct mailname *mp, *mp2;
+ struct mailname *mp;
+ char *cp;
int linepos;
int namelen;
int linepos;
int namelen;
@@
-539,8
+548,17
@@
putadr(char *name, struct mailname *nl)
fprintf(out, "\n%s: ", name);
linepos = namelen;
}
fprintf(out, "\n%s: ", name);
linepos = namelen;
}
- linepos = putone(mp->m_text, linepos, namelen);
- mp2 = mp;
+ if (mp->m_ingrp) {
+ if (mp->m_gname != NULL) {
+ cp = getcpy(mp->m_gname);
+ cp = add(";", cp);
+ linepos = putone(cp, linepos, namelen);
+ free(cp);
+ cp = NULL;
+ }
+ } else {
+ linepos = putone(mp->m_text, linepos, namelen);
+ }
mp = mp->m_next;
}
putc('\n', out);
mp = mp->m_next;
}
putc('\n', out);
@@
-676,6
+694,7
@@
do_aliasing(struct mailname *start, struct mailname **end)
struct mailname *prev, *cur;
char *cp;
size_t i = 0;
struct mailname *prev, *cur;
char *cp;
size_t i = 0;
+ ssize_t e;
prev = start;
cur = prev->m_next;
prev = start;
cur = prev->m_next;
@@
-685,7
+704,10
@@
do_aliasing(struct mailname *start, struct mailname **end)
cp = akvalue(cur->m_mbox);
if (strcmp(cp, cur->m_mbox) != 0) {
prev->m_next = cur->m_next;
cp = akvalue(cur->m_mbox);
if (strcmp(cp, cur->m_mbox) != 0) {
prev->m_next = cur->m_next;
- i += getmboxes(cp, &prev);
+ if ((e = getmboxes(cp, &prev)) < 0) {
+ goto error;
+ }
+ i += e;
i -= 1;
mnfree(cur);
} else {
i -= 1;
mnfree(cur);
} else {
@@
-698,4
+720,7
@@
do_aliasing(struct mailname *start, struct mailname **end)
}
*end = prev;
return i;
}
*end = prev;
return i;
+error:
+ adios(EX_CONFIG, NULL, "can't parse alias %s: %s", cur->m_mbox, cp);
+ return 0; /* not reached */
}
}