X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Ffmtdump.c;h=c9b28cf70a448a8c77d100d7afca88d3362d6c76;hb=dc81afc84b4d53177a1c4fb9fd6fea0ec2912825;hp=a0e6e1409c35f1a4849fa8d190b94f1799354a8a;hpb=ccf4f175ef4c4e7522f9510a4a1149c15d810dd9;p=mmh diff --git a/uip/fmtdump.c b/uip/fmtdump.c index a0e6e14..c9b28cf 100644 --- a/uip/fmtdump.c +++ b/uip/fmtdump.c @@ -10,6 +10,8 @@ #include #include #include +#include +#include static struct swit switches[] = { #define FORMSW 0 @@ -60,29 +62,29 @@ main(int argc, char **argv) switch (smatch(++cp, switches)) { case AMBIGSW: ambigsw(cp, switches); - done(1); + exit(EX_USAGE); case UNKWNSW: - adios(NULL, "-%s unknown", cp); + adios(EX_USAGE, NULL, "-%s unknown", cp); case HELPSW: snprintf(buf, sizeof(buf), "%s [switches]", invo_name); print_help(buf, switches, 1); - done(1); + exit(argc == 2 ? EX_OK : EX_USAGE); case VERSIONSW: print_version(invo_name); - done(1); + exit(argc == 2 ? EX_OK : EX_USAGE); case FORMSW: if (!(form = *argp++) || *form == '-') - adios(NULL, "missing argument to %s", + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); continue; } } if (form) - adios(NULL, "only one form at a time!"); + adios(EX_USAGE, NULL, "only one form at a time!"); else form = cp; } @@ -94,8 +96,7 @@ main(int argc, char **argv) fmt_compile(fmtstr, &fmt); fmt_dump(fmt); - done(0); - return 1; + return EX_OK; } static void