projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gitignore: More specific ignore patterns
[mmh]
/
uip
/
fmtdump.c
diff --git
a/uip/fmtdump.c
b/uip/fmtdump.c
index
a7fe9f4
..
c9b28cf
100644
(file)
--- a/
uip/fmtdump.c
+++ b/
uip/fmtdump.c
@@
-10,12
+10,14
@@
#include <h/fmt_scan.h>
#include <h/fmt_compile.h>
#include <h/scansbr.h>
#include <h/fmt_scan.h>
#include <h/fmt_compile.h>
#include <h/scansbr.h>
+#include <locale.h>
+#include <sysexits.h>
static struct swit switches[] = {
#define FORMSW 0
{ "form formatfile", 0 },
#define VERSIONSW 1
static struct swit switches[] = {
#define FORMSW 0
{ "form formatfile", 0 },
#define VERSIONSW 1
- { "version", 0 },
+ { "Version", 0 },
#define HELPSW 2
{ "help", 0 },
{ NULL, 0 }
#define HELPSW 2
{ "help", 0 },
{ NULL, 0 }
@@
-42,14
+44,11
@@
static void litputc(char);
int
main(int argc, char **argv)
{
int
main(int argc, char **argv)
{
- int ncomps;
char *cp, *form = NULL;
char buf[BUFSIZ], *fmtstr, **argp, **arguments;
struct format *fmt;
char *cp, *form = NULL;
char buf[BUFSIZ], *fmtstr, **argp, **arguments;
struct format *fmt;
-#ifdef LOCALE
setlocale(LC_ALL, "");
setlocale(LC_ALL, "");
-#endif
invo_name = mhbasename(argv[0]);
/* read user profile/context */
invo_name = mhbasename(argv[0]);
/* read user profile/context */
@@
-63,29
+62,29
@@
main(int argc, char **argv)
switch (smatch(++cp, switches)) {
case AMBIGSW:
ambigsw(cp, switches);
switch (smatch(++cp, switches)) {
case AMBIGSW:
ambigsw(cp, switches);
- done(1);
+ exit(EX_USAGE);
case UNKWNSW:
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);
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);
case VERSIONSW:
print_version(invo_name);
- done(1);
+ exit(argc == 2 ? EX_OK : EX_USAGE);
case FORMSW:
if (!(form = *argp++) || *form == '-')
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)
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;
}
else
form = cp;
}
@@
-94,11
+93,10
@@
main(int argc, char **argv)
** Get new format string. Must be before chdir().
*/
fmtstr = new_fs(form, FORMAT);
** Get new format string. Must be before chdir().
*/
fmtstr = new_fs(form, FORMAT);
- ncomps = fmt_compile(fmtstr, &fmt);
+ fmt_compile(fmtstr, &fmt);
fmt_dump(fmt);
fmt_dump(fmt);
- done(0);
- return 1;
+ return EX_OK;
}
static void
}
static void