static struct swit switches[] = {
#define FORMSW 0
{ "form formatfile", 0 },
-#define FMTSW 1
- { "format string", 5 },
-#define VERSIONSW 2
- { "version", 0 },
-#define HELPSW 3
+#define VERSIONSW 1
+ { "Version", 0 },
+#define HELPSW 2
{ "help", 0 },
{ NULL, 0 }
};
int
main(int argc, char **argv)
{
- int ncomps;
- char *cp, *form = NULL, *format = NULL;
- char buf[BUFSIZ], *nfs, **argp, **arguments;
+ char *cp, *form = NULL;
+ char buf[BUFSIZ], *fmtstr, **argp, **arguments;
struct format *fmt;
-#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);
snprintf(buf, sizeof(buf), "%s [switches]",
invo_name);
print_help(buf, switches, 1);
- done(1);
+ exit(0);
case VERSIONSW:
print_version(invo_name);
- done(1);
+ exit(0);
case FORMSW:
if (!(form = *argp++) || *form == '-')
adios(NULL, "missing argument to %s",
argp[-2]);
- format = NULL;
- continue;
- case FMTSW:
- if (!(format = *argp++) || *format == '-')
- adios(NULL, "missing argument to %s",
- argp[-2]);
- form = NULL;
continue;
}
/*
** Get new format string. Must be before chdir().
*/
- nfs = new_fs(form, format, FORMAT);
- ncomps = fmt_compile(nfs, &fmt);
+ fmtstr = new_fs(form, FORMAT);
+ fmt_compile(fmtstr, &fmt);
fmt_dump(fmt);
- done(0);
- return 1;
+ return 0;
}
static void
case FT_PARSEADDR: return("PARSEADDR");
case FT_FORMATADDR: return("FORMATADDR");
case FT_MYMBOX: return("MYMBOX");
-#ifdef FT_ADDTOSEQ
- case FT_ADDTOSEQ: return("ADDTOSEQ");
-#endif
case FT_SAVESTR: return("SAVESTR");
#ifdef FT_PAUSE
case FT_PAUSE: return ("PAUSE");