#define ANNOSW 0
{ "annotate", 0 },
#define NANNOSW 1
- { "noannotate", 0 },
+ { "noannotate", 2 },
#define EDITRSW 2
{ "editor editor", 0 },
-#define NEDITSW 3
- { "noedit", 0 },
-#define FORMSW 4
+#define FORMSW 3
{ "form formfile", 0 },
-#define DGSTSW 5
+#define DGSTSW 4
{ "digest list", 0 },
-#define ISSUESW 6
+#define ISSUESW 5
{ "issue number", 0 },
-#define VOLUMSW 7
+#define VOLUMSW 6
{ "volume number", 0 },
-#define WHATSW 8
+#define WHATSW 7
{ "whatnowproc program", 0 },
-#define NWHATSW 9
- { "nowhatnowproc", 0 },
-#define VERSIONSW 10
- { "version", 0 },
-#define HELPSW 11
+#define VERSIONSW 8
+ { "Version", 0 },
+#define HELPSW 9
{ "help", 0 },
-
-#ifdef MHE
-#define BILDSW 12
+#define BILDSW 10
{ "build", 5 }, /* interface from mhe */
-#endif /* MHE */
-
{ NULL, 0 }
};
{
int msgp = 0, anot = 0;
int issue = 0, volume = 0;
- int nedit = 0, nwhat = 0, in;
+ int in;
int out, msgnum;
char *cp, *cwd, *maildir;
char *digest = NULL, *ed = NULL;
char *form = NULL, buf[BUFSIZ], value[10];
char **argp, **arguments, *msgs[MAXARGS];
char *fmtstr;
-
-#ifdef MHE
int buildsw = 0;
-#endif /* MHE */
-#ifdef LOCALE
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 FORMSW:
}
cwd = getcpy(pwd());
-
-#ifdef MHE
- strncpy(drft, buildsw ? toabsdir("draft")
- : m_draft(seq_beyond), sizeof(drft));
-#else
- strncpy(drft, m_draft(seq_beyond), sizeof(drft));
-#endif /* MHE */
+ strncpy(drft, buildsw ? toabsdir("draft") : 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
+ */
/*
** Forwarding a message.
seq_save(mp); /* synchronize sequences */
context_save(); /* save the context file */
- if (nwhat)
+ if (buildsw)
done(0);
- what_now(ed, nedit, NOUSE, drft, NULL, 0, mp,
+ what_now(ed, NOUSE, drft, NULL, 0, mp,
anot ? "Forwarded" : NULL, cwd);
done(1);
return 1;