- (void) rewrite(pvp, 3, e);
- (void) rewrite(pvp, 1, e);
- (void) rewrite(pvp, 4, e);
- cataddr(pvp, NULL, buf, sizeof buf, '\0');
- e->e_sender = newstr(buf);
+ (void) rewrite(pvp, 3, 0, e);
+ (void) rewrite(pvp, 1, 0, e);
+ (void) rewrite(pvp, 4, 0, e);
+ bp = buf + 1;
+ cataddr(pvp, NULL, bp, sizeof buf - 2, '\0');
+ if (*bp == '@')
+ {
+ /* heuristic: route-addr: add angle brackets */
+ strcat(bp, ">");
+ *--bp = '<';
+ }
+ e->e_sender = newstr(bp);