#include <h/mh.h>
#include <h/addrsbr.h>
#include <h/fmt_scan.h>
+#include <h/utils.h>
+#include <locale.h>
+#include <sysexits.h>
#define NADDRS 100
#define NORMSW 1
{ "normalize", 0 },
#define NNORMSW 2
- { "nonormalize", 0 },
+ { "nonormalize", 2 },
#define VERSIONSW 3
- { "version", 0 },
+ { "Version", 0 },
#define HELPSW 4
{ "help", 0 },
{ NULL, 0 }
{
int addrp = 0, normalize = AD_HOST;
int status = 0;
- char *cp, *form = NULL, *nfs;
+ char *cp, *form = NULL, *fmtstr;
char buf[BUFSIZ], **argp;
char **arguments, *addrs[NADDRS];
-#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);
+ 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] addrs ...", 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", argp[-2]);
+ adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]);
continue;
case NORMSW:
}
}
if (addrp > NADDRS)
- adios(NULL, "more than %d addresses", NADDRS);
+ adios(EX_USAGE, NULL, "more than %d addresses", NADDRS);
else
addrs[addrp++] = cp;
}
addrs[addrp] = NULL;
if (addrp == 0)
- adios(NULL, "usage: %s [switches] addrs ...", invo_name);
+ adios(EX_USAGE, NULL, "usage: %s [switches] addrs ...", invo_name);
/* get new format string */
- nfs = new_fs(form, FORMAT);
+ fmtstr = new_fs(form, FORMAT);
fmt_norm = normalize;
- fmt_compile(nfs, &fmt);
+ fmt_compile(fmtstr, &fmt);
dat[0] = 0;
dat[1] = 0;
for (addrp = 0; addrs[addrp]; addrp++)
status += process(addrs[addrp], normalize);
- done(status);
- return 1;
+ return status;
}
struct pqpair {
process(char *arg, int norm)
{
int status = 0;
- register char *cp;
+ char *cp;
char buffer[BUFSIZ + 1], error[BUFSIZ];
- register struct comp *cptr;
- register struct pqpair *p, *q;
+ struct comp *cptr;
+ struct pqpair *p, *q;
struct pqpair pq;
- register struct mailname *mp;
+ struct mailname *mp;
(q = &pq)->pq_next = NULL;
while ((cp = getname(arg))) {
- if ((p = (struct pqpair *)
- calloc((size_t) 1, sizeof(*p))) == NULL)
- adios(NULL, "unable to allocate pqpair memory");
+ p = (struct pqpair *) mh_xcalloc((size_t) 1, sizeof(*p));
if ((mp = getm(cp, NULL, 0, norm, error)) == NULL) {
p->pq_text = getcpy(cp);
p->pq_error = getcpy(error);