* static prototypes
*/
static int insert (struct mailname *);
-static void replfilter (FILE *, FILE *, char *);
+static void replfilter (FILE *, FILE *, char *, int);
void
replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
- int mime, char *form, char *filter, char *fcc)
+ int mime, char *form, char *filter, char *fcc, int fmtproc)
{
- NMH_UNUSED (msg);
-
register int state, i;
register struct comp *cptr;
register char *tmpbuf;
char name[NAMESZ], *scanl;
unsigned char *cp;
FILE *out;
+ NMH_UNUSED (msg);
mask = umask(~m_gmprot());
if ((out = fopen (drft, "w")) == NULL)
if (!mh_strcasecmp(name, cptr->c_name)) {
char_read += msg_count;
if (! cptr->c_text) {
- i = strlen(cptr->c_text = tmpbuf) - 1;
- if (tmpbuf[i] == '\n')
- tmpbuf[i] = '\0';
+ cptr->c_text = tmpbuf;
*--savecomp = cptr;
tmpbuf = *nxtbuf++;
} else {
if (ferror (out))
adios (drft, "error writing");
- replfilter (inb, out, filter);
+ replfilter (inb, out, filter, fmtproc);
} else if (mime && mp) {
fprintf (out, "#forw [original message] +%s %s\n",
mp->foldpath, m_name (mp->lowsel));
*/
static void
-replfilter (FILE *in, FILE *out, char *filter)
+replfilter (FILE *in, FILE *out, char *filter, int fmtproc)
{
int pid;
char *mhl;
char *errstr;
+ char *arglist[7];
if (filter == NULL)
return;
rewind (in);
lseek (fileno(in), (off_t) 0, SEEK_SET);
- switch (pid = vfork ()) {
+ switch (pid = vfork()) {
case NOTOK:
adios ("fork", "unable to");
dup2 (fileno (out), fileno (stdout));
closefds (3);
- execlp (mhlproc, mhl, "-form", filter, "-noclear", NULL);
+ arglist[0] = mhl;
+ arglist[1] = "-form";
+ arglist[2] = filter;
+ arglist[3] = "-noclear";
+
+ switch (fmtproc) {
+ case 1:
+ arglist[4] = "-fmtproc";
+ arglist[5] = formatproc;
+ arglist[6] = NULL;
+ break;
+ case 0:
+ arglist[4] = "-nofmtproc";
+ arglist[5] = NULL;
+ break;
+ default:
+ arglist[4] = NULL;
+ }
+
+ execvp (mhlproc, arglist);
errstr = strerror(errno);
write(2, "unable to exec ", 15);
write(2, mhlproc, strlen(mhlproc));