#define GROUPSW 0
{ "group", 0 },
#define NGROUPSW 1
- { "nogroup", 0 },
+ { "nogroup", 2 },
#define ANNOSW 2
{ "annotate", 0 },
#define NANNOSW 3
- { "noannotate", 0 },
+ { "noannotate", 2 },
#define CCSW 4
{ "cc all|to|cc|me", 0 },
#define NCCSW 5
- { "nocc type", 0 },
+ { "nocc type", 2 },
#define EDITRSW 6
{ "editor editor", 0 },
-#define NEDITSW 7
- { "noedit", 0 },
-#define FILTSW 8
+#define FILTSW 7
{ "filter filterfile", 0 },
+#define NFILTSW 8
+ { "nofilter", 2 },
#define FORMSW 9
{ "form formfile", 0 },
-#define FRMTSW 10
- { "format", 5 },
-#define NFRMTSW 11
- { "noformat", 7 },
-#define MIMESW 12
+#define MIMESW 10
{ "mime", 0 },
-#define NMIMESW 13
- { "nomime", 0 },
-#define QURYSW 14
+#define NMIMESW 11
+ { "nomime", 2 },
+#define QURYSW 12
{ "query", 0 },
-#define NQURYSW 15
- { "noquery", 0 },
-#define WHATSW 16
+#define NQURYSW 13
+ { "noquery", 2 },
+#define WHATSW 14
{ "whatnowproc program", 0 },
-#define NWHATSW 17
- { "nowhatnowproc", 0 },
-#define VERSIONSW 18
- { "version", 0 },
-#define HELPSW 19
+#define VERSIONSW 15
+ { "Version", 0 },
+#define HELPSW 16
{ "help", 0 },
-#define FILESW 20
+#define FILESW 17
{ "file file", 4 }, /* interface from msh */
-
-#ifdef MHE
-#define BILDSW 21
+#define BILDSW 18
{ "build", 5 }, /* interface from mhe */
-#endif
-
{ NULL, 0 }
};
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 *);
main(int argc, char **argv)
{
int anot = 0;
- int nedit = 0, nwhat = 0;
char *cp, *cwd, *maildir, *file = NULL;
char *folder = NULL, *msg = NULL;
char *ed = NULL, drft[BUFSIZ], buf[BUFSIZ];
char **argp, **arguments;
struct msgs *mp = NULL;
FILE *in;
-
-#ifdef MHE
int buildsw = 0;
-#endif /* MHE */
-#ifdef LOCALE
+ filter = getcpy(etcpath(mhlreply));
+
setlocale(LC_ALL, "");
-#endif
invo_name = mhbasename(argv[0]);
/* read user profile/context */
if (!(ed = *argp++) || *ed == '-')
adios(NULL, "missing argument to %s",
argp[-2]);
- nedit = 0;
- continue;
- case NEDITSW:
- nedit++;
continue;
case WHATSW:
*whatnowproc == '-')
adios(NULL, "missing argument to %s",
argp[-2]);
- nwhat = 0;
continue;
-#ifdef MHE
+
case BILDSW:
- buildsw++; /* fall... */
-#endif /* MHE */
- case NWHATSW:
- nwhat++;
+ buildsw++;
continue;
case FILESW:
argp[-2]);
file = getcpy(expanddir(cp));
continue;
- case FILTSW:
- if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
- argp[-2]);
- filter = getcpy(etcpath(cp));
- mime = 0;
- continue;
case FORMSW:
if (!(form = *argp++) || *form == '-')
adios(NULL, "missing argument to %s",
argp[-2]);
continue;
- case FRMTSW:
- filter = getcpy(etcpath(mhlreply));
- mime = 0;
+ case FILTSW:
+ if (!(cp = *argp++) || *cp == '-')
+ adios(NULL, "missing argument to %s",
+ argp[-2]);
+ filter = getcpy(etcpath(cp));
continue;
- case NFRMTSW:
+ case NFILTSW:
filter = NULL;
continue;
case MIMESW:
mime++;
- filter = NULL;
continue;
case NMIMESW:
mime = 0;
if (file && (msg || folder))
adios(NULL, "can't mix files and folders/msgs");
-#ifdef MHE
- strncpy(drft, buildsw ? toabsdir("reply")
- : m_draft(seq_beyond), sizeof(drft));
-#else
- strncpy(drft, m_draft(seq_beyond), sizeof(drft));
-#endif /* MHE */
+ strncpy(drft, buildsw ? toabsdir("reply") : m_draft(seq_beyond),
+ sizeof(drft));
+ /*
+ ** FIXME: (concerning MHE support (buildsw) only)
+ ** There's no check if the draft already exists. mmh has removed
+ ** this case by having the draft folder. I won't add code only to
+ ** handle this legacy issue for MHE. -- meillo@marmaro.de 2012-05
+ */
if (file) {
/*
form = etcpath(replcomps);
}
- replout(in, msg, drft, mp, mime, form, filter);
+ replout(in, drft, mp, mime, form, filter);
fclose(in);
- if (nwhat)
+ if (buildsw)
done(0);
- what_now(ed, nedit, NOUSE, drft, msg, 0, mp, anot ? "Replied" : NULL,
- cwd);
+ what_now(ed, NOUSE, drft, msg, 0, mp, anot ? "Replied" : NULL, cwd);
done(1);
return 1;
}
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;
umask(mask);
/* get new format string */
- cp = new_fs(form, NULL, NULL);
+ cp = new_fs(form, NULL);
format_len = strlen(cp);
/* compile format string */
adios(drft, "error writing");
fclose(out);
- /* if we want mime, then add an attachment header */
- if (!filter && mime && mp) {
+ if (mime && mp) {
+ /* 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);
+ 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;
}
/*
-** Call the mhlproc
+** Call mhl
**
** This function expects that argument out has been fflushed by the caller.
*/
-
static void
replfilter(FILE *in, FILE *out, char *filter)
{
- int pid;
- char *mhl;
+ int pid, n;
char *errstr;
if (filter == NULL)
if (access(filter, R_OK) == NOTOK)
adios(filter, "unable to read");
- mhl = mhbasename(mhlproc);
-
rewind(in);
lseek(fileno(in), (off_t) 0, SEEK_SET);
case OK:
dup2(fileno(in), fileno(stdin));
dup2(fileno(out), fileno(stdout));
- closefds(3);
+ for (n=3; n<OPEN_MAX; n++) {
+ close(n);
+ }
- execlp(mhlproc, mhl, "-form", filter, "-noclear", NULL);
+ execlp("mhl", "mhl", "-form", filter, NULL);
errstr = strerror(errno);
- write(2, "unable to exec ", 15);
- write(2, mhlproc, strlen(mhlproc));
- write(2, ": ", 2);
+ write(2, "unable to exec mhl: ", 20);
write(2, errstr, strlen(errstr));
write(2, "\n", 1);
_exit(-1);
default:
- if (pidXwait(pid, mhl))
+ if (pidXwait(pid, "mhl"))
done(1);
fseek(out, 0L, SEEK_END);
break;