X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fap.c;h=4f7f7603001af91c1745d045ca1e1d812a1d8ed2;hp=1e2151b8d2c430c60bc5dd61c22b2a65156ff8f9;hb=d3540eaa4251b3a282115a72ed5d1bb39ce74b3f;hpb=a485ed478abbd599d8c9aab48934e7a26733ecb1 diff --git a/uip/ap.c b/uip/ap.c index 1e2151b..4f7f760 100644 --- a/uip/ap.c +++ b/uip/ap.c @@ -1,10 +1,10 @@ /* - * ap.c -- parse addresses 822-style - * - * This code is Copyright (c) 2002, by the authors of nmh. See the - * COPYRIGHT file in the root directory of the nmh distribution for - * complete copyright information. - */ +** ap.c -- parse addresses 822-style +** +** This code is Copyright (c) 2002, by the authors of nmh. See the +** COPYRIGHT file in the root directory of the nmh distribution for +** complete copyright information. +*/ #include #include @@ -41,18 +41,18 @@ static struct format *fmt; static int dat[5]; /* - * prototypes - */ -int sc_width (void); /* from termsbr.c */ +** prototypes +*/ +int sc_width(void); /* from termsbr.c */ /* - * static prototypes - */ -static int process (char *, int, int); +** static prototypes +*/ +static int process(char *, int, int); int -main (int argc, char **argv) +main(int argc, char **argv) { int addrp = 0, normalize = AD_HOST; int width = 0, status = 0; @@ -63,81 +63,79 @@ main (int argc, char **argv) #ifdef LOCALE setlocale(LC_ALL, ""); #endif - invo_name = r1bindex (argv[0], '/'); + invo_name = mhbasename(argv[0]); /* read user profile/context */ context_read(); - mts_init (invo_name); - arguments = getarguments (invo_name, argc, argv, 1); + arguments = getarguments(invo_name, argc, argv, 1); argp = arguments; while ((cp = *argp++)) { if (*cp == '-') { - switch (smatch (++cp, switches)) { - case AMBIGSW: - ambigsw (cp, switches); - done (1); - - case UNKWNSW: - adios (NULL, "-%s unknown", cp); - - case HELPSW: - snprintf (buf, sizeof(buf), "%s [switches] addrs ...", - invo_name); - print_help (buf, switches, 1); - done (1); - case VERSIONSW: - print_version (invo_name); - done (1); - - case FORMSW: - 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; - - case WIDTHSW: - if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); - width = atoi (cp); - continue; - - case NORMSW: - normalize = AD_HOST; - continue; - case NNORMSW: - normalize = AD_NHST; - continue; + switch (smatch(++cp, switches)) { + case AMBIGSW: + ambigsw(cp, switches); + done(1); + + case UNKWNSW: + adios(NULL, "-%s unknown", cp); + + case HELPSW: + snprintf(buf, sizeof(buf), "%s [switches] addrs ...", invo_name); + print_help(buf, switches, 1); + done(1); + case VERSIONSW: + print_version(invo_name); + done(1); + + case FORMSW: + 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; + + case WIDTHSW: + if (!(cp = *argp++) || *cp == '-') + adios(NULL, "missing argument to %s", argp[-2]); + width = atoi(cp); + continue; + + case NORMSW: + normalize = AD_HOST; + continue; + case NNORMSW: + normalize = AD_NHST; + continue; } } if (addrp > NADDRS) - adios (NULL, "more than %d addresses", NADDRS); + adios(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(NULL, "usage: %s [switches] addrs ...", invo_name); /* get new format string */ - nfs = new_fs (form, format, FORMAT); + nfs = new_fs(form, format, FORMAT); if (width == 0) { - if ((width = sc_width ()) < WIDTH / 2) + if ((width = sc_width()) < WIDTH / 2) width = WIDTH / 2; width -= 2; } if (width > WBUFSIZ) width = WBUFSIZ; fmt_norm = normalize; - fmt_compile (nfs, &fmt); + fmt_compile(nfs, &fmt); dat[0] = 0; dat[1] = 0; @@ -146,9 +144,9 @@ main (int argc, char **argv) dat[4] = 0; for (addrp = 0; addrs[addrp]; addrp++) - status += process (addrs[addrp], width, normalize); + status += process(addrs[addrp], width, normalize); - done (status); + done(status); return 1; } @@ -160,7 +158,7 @@ struct pqpair { static int -process (char *arg, int length, int norm) +process(char *arg, int length, int norm) { int status = 0; register char *cp; @@ -171,37 +169,37 @@ process (char *arg, int length, int norm) register 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"); - if ((mp = getm (cp, NULL, 0, norm, error)) == NULL) { - p->pq_text = getcpy (cp); - p->pq_error = getcpy (error); + while ((cp = getname(arg))) { + if ((p = (struct pqpair *) + calloc((size_t) 1, sizeof(*p))) == NULL) + adios(NULL, "unable to allocate pqpair memory"); + if ((mp = getm(cp, NULL, 0, norm, error)) == NULL) { + p->pq_text = getcpy(cp); + p->pq_error = getcpy(error); status++; - } - else { - p->pq_text = getcpy (mp->m_text); - mnfree (mp); + } else { + p->pq_text = getcpy(mp->m_text); + mnfree(mp); } q = (q->pq_next = p); } for (p = pq.pq_next; p; p = q) { - FINDCOMP (cptr, "text"); + FINDCOMP(cptr, "text"); if (cptr) cptr->c_text = p->pq_text; - FINDCOMP (cptr, "error"); + FINDCOMP(cptr, "error"); if (cptr) cptr->c_text = p->pq_error; - fmt_scan (fmt, buffer, length, dat); - fputs (buffer, stdout); + fmt_scan(fmt, buffer, length, dat); + fputs(buffer, stdout); - free (p->pq_text); + free(p->pq_text); if (p->pq_error) - free (p->pq_error); + free(p->pq_error); q = p->pq_next; - free ((char *) p); + free((char *) p); } return status;