{ "editor editor", 0 },
#define NEDITSW 7
{ "noedit", 0 },
-#define FCCSW 8
- { "fcc folder", 0 },
-#define FILTSW 9
+#define FILTSW 8
{ "filter filterfile", 0 },
-#define FORMSW 10
+#define FORMSW 9
{ "form formfile", 0 },
-#define FRMTSW 11
+#define FRMTSW 10
{ "format", 5 },
-#define NFRMTSW 12
+#define NFRMTSW 11
{ "noformat", 7 },
-#define INPLSW 13
- { "inplace", 0 },
-#define NINPLSW 14
- { "noinplace", 0 },
-#define MIMESW 15
+#define MIMESW 12
{ "mime", 0 },
-#define NMIMESW 16
+#define NMIMESW 13
{ "nomime", 0 },
-#define QURYSW 17
+#define QURYSW 14
{ "query", 0 },
-#define NQURYSW 18
+#define NQURYSW 15
{ "noquery", 0 },
-#define WHATSW 19
+#define WHATSW 16
{ "whatnowproc program", 0 },
-#define NWHATSW 20
+#define NWHATSW 17
{ "nowhatnowproc", 0 },
-#define WIDTHSW 21
- { "width columns", 0 },
-#define VERSIONSW 22
+#define VERSIONSW 18
{ "version", 0 },
-#define HELPSW 23
+#define HELPSW 19
{ "help", 0 },
-#define FILESW 24
+#define FILESW 20
{ "file file", 4 }, /* interface from msh */
#ifdef MHE
-#define BILDSW 25
+#define BILDSW 21
{ "build", 5 }, /* interface from mhe */
#endif
short ccme = -1;
short querysw = 0;
-short outputlinelen = OUTPUTLINELEN;
short groupreply = 0; /* Is this a group reply? */
int mime = 0; /* include original as MIME part */
char *form = NULL; /* form (components) file */
char *filter = NULL; /* message filter file */
-char *fcc = NULL; /* folders to add to Fcc: header */
/*
int
main(int argc, char **argv)
{
- int anot = 0, inplace = 1;
+ int anot = 0;
int nedit = 0, nwhat = 0;
- char *cp, *cwd, *dp, *maildir, *file = NULL;
+ char *cp, *cwd, *maildir, *file = NULL;
char *folder = NULL, *msg = NULL;
char *ed = NULL, drft[BUFSIZ], buf[BUFSIZ];
char **argp, **arguments;
nwhat++;
continue;
- case FCCSW:
- if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
- argp[-2]);
- dp = NULL;
- if (*cp == '@')
- cp = dp = getcpy(expandfol(cp));
- if (fcc)
- fcc = add(", ", fcc);
- fcc = add(cp, fcc);
- if (dp)
- free(dp);
- continue;
-
case FILESW:
if (file)
adios(NULL, "only one file at a time!");
filter = NULL;
continue;
- case INPLSW:
- inplace++;
- continue;
- case NINPLSW:
- inplace = 0;
- continue;
-
case MIMESW:
mime++;
filter = NULL;
querysw = 0;
continue;
- case WIDTHSW:
- if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
- argp[-2]);
- if ((outputlinelen = atoi(cp)) < 10)
- adios(NULL, "impossible width %d",
- outputlinelen);
- continue;
}
}
if (*cp == '+' || *cp == '@') {
#ifdef MHE
strncpy(drft, buildsw ? toabsdir("reply")
- : m_draft("new"), sizeof(drft));
+ : m_draft(seq_beyond), sizeof(drft));
#else
- strncpy(drft, m_draft("new"), sizeof(drft));
+ strncpy(drft, m_draft(seq_beyond), sizeof(drft));
#endif /* MHE */
if (file) {
** We are replying to a message.
*/
if (!msg)
- msg = "cur";
+ msg = seq_cur;
if (!folder)
folder = getcurfol();
maildir = toabsdir(folder);
form = etcpath(replcomps);
}
- replout(in, msg, drft, mp, outputlinelen, mime, form, filter, fcc);
+ replout(in, msg, drft, mp, mime, form, filter);
fclose(in);
if (nwhat)
done(0);
what_now(ed, nedit, NOUSE, drft, msg, 0, mp, anot ? "Replied" : NULL,
- inplace, cwd);
+ cwd);
done(1);
return 1;
}