#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 WHATSW 5
+#define WHATSW 4
{ "whatnowproc program", 0 },
-#define VERSIONSW 6
- { "version", 0 },
-#define HELPSW 7
+#define VERSIONSW 5
+ { "Version", 0 },
+#define HELPSW 6
{ "help", 0 },
{ NULL, 0 }
};
int
main(int argc, char **argv)
{
- int anot = 0, nedit = 0;
+ int anot = 0;
int in, out;
char *cp, *cwd, *maildir, *msgnam;
char *ed = NULL, *folder = NULL;
struct msgs *mp = NULL;
char *fmtstr;
-#ifdef LOCALE
setlocale(LC_ALL, "");
-#endif
invo_name = mhbasename(argv[0]);
/* read user profile/context */
switch (smatch(++cp, switches)) {
case AMBIGSW:
ambigsw(cp, switches);
- done(1);
+ /* sysexits.h EX_USAGE*/
+ exit(1);
case UNKWNSW:
adios(NULL, "-%s unknown", cp);
case HELPSW:
snprintf(buf, sizeof(buf), "%s [+folder] [msg] [switches]", invo_name);
print_help(buf, switches, 1);
- done(1);
+ exit(0);
case VERSIONSW:
print_version(invo_name);
- done(1);
+ exit(0);
case ANNOSW:
anot++;
if (!(ed = *argp++) || *ed == '-')
adios(NULL, "missing argument to %s",
argp[-2]);
- nedit = 0;
- continue;
- case NEDITSW:
- nedit++;
continue;
case WHATSW:
/* parse the message range/sequence/name and set SELECTED */
if (!m_convert(mp, msg))
- done(1);
+ /* sysexits.h EX_USAGE*/
+ exit(1);
seq_setprev(mp);
if (mp->numsel > 1)
seq_save(mp); /* synchronize sequences */
context_save();
- what_now(ed, nedit, NOUSE, drft, msgnam, 1, mp,
- anot ? "Resent" : NULL, cwd);
- done(1);
+ what_now(ed, NOUSE, drft, msgnam, 1, mp, anot ? "Resent" : NULL, cwd);
+ /*sysexits.h EX_SOFTWARE*/
return 1;
}