static char *badaddrs = NULL;
static char *dfhost = NULL;
-static struct mailname mq = { NULL };
+static struct mailname mq;
static struct format *fmt;
static void docc(char *, int);
static int insert(struct mailname *);
static void replfilter(FILE *, FILE *, char *);
-static void replout(FILE *, char *, char *, struct msgs *, int,
+static void replout(FILE *, char *, struct msgs *, int,
char *, char *);
struct msgs *mp = NULL;
FILE *in;
- filter = getcpy(etcpath(mhlreply));
-
#ifdef MHE
int buildsw = 0;
#endif /* MHE */
+ filter = getcpy(etcpath(mhlreply));
+
#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
form = etcpath(replcomps);
}
- replout(in, msg, drft, mp, mime, form, filter);
+ replout(in, drft, mp, mime, form, filter);
fclose(in);
if (nwhat)
static void
-replout(FILE *inb, char *msg, char *drft, struct msgs *mp,
+replout(FILE *inb, char *drft, struct msgs *mp,
int mime, char *form, char *filter)
{
register int state, i;
/* add an attachment header */
char buffer[BUFSIZ];
- snprintf(buffer, sizeof buffer, "+%s %s",
- mp->foldpath, m_name(mp->lowsel));
- annotate(drft, attach_hdr, buffer, 0, -2, 1, 0);
+ snprintf(buffer, sizeof buffer, "anno -append -nodate '%s' "
+ "-comp '%s' -text '+%s %s'",
+ drft,
+ attach_hdr, mp->foldpath, m_name(mp->lowsel));
+ if (system(buffer) != 0) {
+ advise(NULL, "unable to add attachment header");
+ }
}
/* return dynamically allocated buffers */
snprintf(buffer, sizeof(buffer), "Reply to %s? ",
adrformat(np));
if (!gans(buffer, anoyes))
- return 0;
+ return 0;
}
mp->m_next = np;
-
-#ifdef ISI
- if (ismymbox(np))
- ccme = 0;
-#endif
-
return 1;
}
static void
replfilter(FILE *in, FILE *out, char *filter)
{
- int pid;
+ int pid, n;
char *errstr;
if (filter == NULL)
case OK:
dup2(fileno(in), fileno(stdin));
dup2(fileno(out), fileno(stdout));
- closefds(3);
+ for (n=3; n<OPEN_MAX; n++) {
+ close(n);
+ }
execlp("mhl", "mhl", "-form", filter, NULL);
errstr = strerror(errno);