projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This is mmh-0.2
[mmh]
/
uip
/
ali.c
diff --git
a/uip/ali.c
b/uip/ali.c
index
2c80147
..
dc2a341
100644
(file)
--- a/
uip/ali.c
+++ b/
uip/ali.c
@@
-10,6
+10,8
@@
#include <h/addrsbr.h>
#include <h/aliasbr.h>
#include <h/utils.h>
#include <h/addrsbr.h>
#include <h/aliasbr.h>
#include <h/utils.h>
+#include <locale.h>
+#include <sysexits.h>
/*
** maximum number of names
/*
** maximum number of names
@@
-72,24
+74,25
@@
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] aliases ...",
invo_name);
print_help(buf, switches, 1);
case HELPSW:
snprintf(buf, sizeof(buf), "%s [switches] aliases ...",
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 FILESW:
case FILESW:
- if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s", argp[-2]);
+ if (!(cp = *argp++) || *cp == '-') {
+ adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]);
+ }
if ((i = alias(cp)) != AK_OK)
if ((i = alias(cp)) != AK_OK)
- adios(NULL, "aliasing error in %s: %s", cp, akerror(i));
+ adios(EX_USAGE, NULL, "aliasing error in %s: %s", cp, akerror(i));
deffiles = 0;
continue;
deffiles = 0;
continue;
@@
-125,7
+128,7
@@
main(int argc, char **argv)
for (ap = brkstring(dp=getcpy(cp), " ", "\n");
ap && *ap; ap++) {
if ((i = alias(etcpath(*ap))) != AK_OK) {
for (ap = brkstring(dp=getcpy(cp), " ", "\n");
ap && *ap; ap++) {
if ((i = alias(etcpath(*ap))) != AK_OK) {
- adios(NULL, "aliasing error in %s: %s",
+ adios(EX_DATAERR, NULL, "aliasing error in %s: %s",
*ap, akerror(i));
}
}
*ap, akerror(i));
}
}
@@
-139,13
+142,13
@@
main(int argc, char **argv)
*/
if (inverted) {
if (vecp == 0)
*/
if (inverted) {
if (vecp == 0)
- adios(NULL, "usage: %s -user addresses ... (you forgot the addresses)",
+ adios(EX_USAGE, NULL, "usage: %s -user addresses ... (you forgot the addresses)",
invo_name);
for (i = 0; i < vecp; i++)
print_usr(vec[i], list, normalize);
invo_name);
for (i = 0; i < vecp; i++)
print_usr(vec[i], list, normalize);
- done(0);
+ exit(EX_OK);
}
if (vecp) {
}
if (vecp) {
@@
-161,8
+164,7
@@
main(int argc, char **argv)
}
}
}
}
- done(0);
- return 1;
+ return EX_OK;
}
static void
}
static void
@@
-208,14
+210,14
@@
print_aka(char *p, int list, int margin)
static void
print_usr(char *s, int list, int norm)
{
static void
print_usr(char *s, int list, int norm)
{
- register char *cp, *pp, *vp;
- register struct aka *ak;
- register struct mailname *mp, *np;
+ char *cp, *pp, *vp;
+ struct aka *ak;
+ struct mailname *mp, *np;
if ((pp = getname(s)) == NULL)
if ((pp = getname(s)) == NULL)
- adios(NULL, "no address in \"%s\"", s);
+ adios(EX_DATAERR, NULL, "no address in \"%s\"", s);
if ((mp = getm(pp, NULL, 0, norm, NULL)) == NULL)
if ((mp = getm(pp, NULL, 0, norm, NULL)) == NULL)
- adios(NULL, "bad address \"%s\"", s);
+ adios(EX_DATAERR, NULL, "bad address \"%s\"", s);
while (getname(""))
continue;
while (getname(""))
continue;