static struct swit switches[] = {
#define FORMSW 0
{ "form formatfile", 0 },
-#define FMTSW 1
- { "format string", 5 },
-#define VERSIONSW 2
+#define VERSIONSW 1
{ "version", 0 },
-#define HELPSW 3
+#define HELPSW 2
{ "help", 0 },
{ NULL, 0 }
};
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
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, NULL, FORMAT);
- ncomps = fmt_compile(nfs, &fmt);
+ fmtstr = new_fs(form, FORMAT);
+ ncomps = fmt_compile(fmtstr, &fmt);
fmt_dump(fmt);
done(0);