#define VERBSW 0
{ "verbose", 0 },
#define NVERBSW 1
- { "noverbose", 0 },
+ { "noverbose", 2 },
#define FILESW 2 /* interface from show */
{ "file file", 0 },
#define FORMSW 3
#define TYPESW 5
{ "type content", 0 },
#define VERSIONSW 6
- { "version", 0 },
+ { "Version", 0 },
#define HELPSW 7
{ "help", 0 },
#define DEBUGSW 8
/* mhfree.c */
void free_content(CT);
extern CT *cts;
-void freects_done(int) NORETURN;
+void freects_done();
/*
** static prototypes
FILE *fp;
int ontty = 0;
- done=freects_done;
+ atexit(freects_done);
-#ifdef LOCALE
setlocale(LC_ALL, "");
-#endif
invo_name = mhbasename(argv[0]);
if (mh_strcasecmp(invo_name, "next")==0) {
mode = NEXT;
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] %s[switches]", invo_name, mode==SHOW ? "[msgs] " : "");
print_help(buf, switches, 1);
- done(1);
+ exit(0);
case VERSIONSW:
print_version(invo_name);
- done(1);
+ exit(0);
case PARTSW:
if (!(cp = *argp++) || *cp == '-')
case FILESW:
if (mode != SHOW) {
- adios(NULL, "Either call mhshow as `%s' or use -file", invo_name);
+ adios(NULL, "Either call show as `%s' or use -file", invo_name);
}
if (!(cp = *argp++) || (*cp == '-' && cp[1]))
else
folder = getcpy(expandfol(cp));
} else if (mode != SHOW) {
- adios(NULL, "Either call mhshow as `%s' or give message arguments", invo_name);
+ adios(NULL, "Either call show as `%s' or give message arguments", invo_name);
} else {
app_msgarg(&msgs, cp);
}
/* parse all the message ranges/sequences and set SELECTED */
for (msgnum = 0; msgnum < msgs.size; msgnum++)
if (!m_convert(mp, msgs.msgs[msgnum]))
- done(1);
+ /* sysexits.h EX_USAGE */
+ exit(1);
/*
** Set the SELECT_UNSEEN bit for all the SELECTED messages,
}
if (!*cts)
- done(1);
+ exit(1);
userrs = 1;
SIGNAL(SIGQUIT, quitser);
context_save(); /* save the context file */
}
- done(0);
- return 1;
+ return 0;
}
fflush(stderr);
}
- done(1);
+ exit(1);
/* NOTREACHED */
}