{ "nocc type", 0 },
#define EDITRSW 6
{ "editor editor", 0 },
-#define NEDITSW 7
- { "noedit", 0 },
-#define FILTSW 8
+#define FILTSW 7
{ "filter filterfile", 0 },
-#define NFILTSW 9
+#define NFILTSW 8
{ "nofilter", 0 },
-#define FORMSW 10
+#define FORMSW 9
{ "form formfile", 0 },
-#define MIMESW 11
+#define MIMESW 10
{ "mime", 0 },
-#define NMIMESW 12
+#define NMIMESW 11
{ "nomime", 0 },
-#define QURYSW 13
+#define QURYSW 12
{ "query", 0 },
-#define NQURYSW 14
+#define NQURYSW 13
{ "noquery", 0 },
-#define WHATSW 15
+#define WHATSW 14
{ "whatnowproc program", 0 },
-#define VERSIONSW 16
- { "version", 0 },
-#define HELPSW 17
+#define VERSIONSW 15
+ { "Version", 0 },
+#define HELPSW 16
{ "help", 0 },
-#define FILESW 18
+#define FILESW 17
{ "file file", 4 }, /* interface from msh */
-#ifdef MHE
-# define BILDSW 19
+# define BILDSW 18
{ "build", 5 }, /* interface from mhe */
-#endif
{ NULL, 0 }
};
main(int argc, char **argv)
{
int anot = 0;
- int nedit = 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 */
filter = getcpy(etcpath(mhlreply));
if (!(ed = *argp++) || *ed == '-')
adios(NULL, "missing argument to %s",
argp[-2]);
- nedit = 0;
- continue;
- case NEDITSW:
- nedit++;
continue;
case WHATSW:
adios(NULL, "missing argument to %s",
argp[-2]);
continue;
-#ifdef MHE
+
case BILDSW:
- buildsw++; /* fall... */
+ buildsw++;
continue;
-#endif /* MHE */
case FILESW:
if (file)
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) {
/*
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;
}