static struct swit switches[] = {
#define EDITRSW 0
{ "editor editor", 0 },
-#define NEDITSW 1
- { "noedit", 0 },
-#define FORMSW 2
+#define FORMSW 1
{ "form formfile", 0 },
-#define USESW 3
+#define USESW 2
{ "use", 0 },
-#define NUSESW 4
- { "nouse", 0 },
-#define WHATSW 5
+#define NUSESW 3
+ { "nouse", 2 },
+#define WHATSW 4
{ "whatnowproc program", 0 },
-#define NWHATSW 6
- { "nowhatnowproc", 0 },
-#define VERSIONSW 7
- { "version", 0 },
-#define HELPSW 8
+#define VERSIONSW 5
+ { "Version", 0 },
+#define HELPSW 6
{ "help", 0 },
{ NULL, 0 }
};
int
main(int argc, char **argv)
{
- int use = NOUSE, nedit = 0, nwhat = 0;
+ int use = NOUSE;
int in, out;
char *cp, *cwd, *maildir;
char *ed = NULL, *form = NULL;
char *folder = NULL, *msg = NULL, buf[BUFSIZ];
char drft[BUFSIZ], **argp, **arguments;
struct msgs *mp = NULL;
- char *nfs;
+ 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 EDITRSW:
if (!(ed = *argp++) || *ed == '-')
adios(NULL, "missing argument to %s", argp[-2]);
- nedit = 0;
- continue;
- case NEDITSW:
- nedit++;
continue;
case WHATSW:
if (!(whatnowproc = *argp++) || *whatnowproc == '-')
adios(NULL, "missing argument to %s", argp[-2]);
- nwhat = 0;
- continue;
- case NWHATSW:
- nwhat++;
continue;
case FORMSW:
adios(NULL, "no messages in %s", folder);
/* 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); /* set the previous-sequence */
if (mp->numsel > 1)
adios(NULL, "only one message at a time!");
close(out);
} else {
- nfs = new_fs(form, components);
+ fmtstr = new_fs(form, components);
strncpy(drft, m_draft(seq_beyond), sizeof(drft));
if ((out = creat(drft, m_gmprot())) == NOTOK) {
adios(drft, "unable to create");
}
- if (write(out, nfs, strlen(nfs)) != strlen(nfs)) {
+ if (write(out, fmtstr, strlen(fmtstr)) != (int)strlen(fmtstr)) {
adios(drft, "error writing");
}
close(out);
}
context_save();
-
- if (nwhat) {
- done(0);
- }
- what_now(ed, nedit, use, drft, NULL, 0, NULLMP, NULL, cwd);
- done(1);
+ what_now(ed, use, drft, NULL, 0, NULLMP, NULL, cwd);
+ /* sysexits.h EX_SOFTWARE */
return 1;
}