/*
- * 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 <h/mh.h>
#include <h/addrsbr.h>
#include <h/fmt_scan.h>
-#include <h/mts.h>
#define NADDRS 100
-#define WIDTH 78
-#define WBUFSIZ BUFSIZ
-
-#define FORMAT "%<{error}%{error}: %{text}%|%(putstr(proper{text}))%>"
+#define FORMAT "=%<{error}%{error}: %{text}%|%(putstr(proper{text}))%>"
static struct swit switches[] = {
#define FORMSW 0
{ "form formatfile", 0 },
-#define FMTSW 1
- { "format string", 5 },
-#define NORMSW 2
+#define NORMSW 1
{ "normalize", 0 },
-#define NNORMSW 3
+#define NNORMSW 2
{ "nonormalize", 0 },
-#define WIDTHSW 4
- { "width columns", 0 },
-#define VERSIONSW 5
- { "version", 0 },
-#define HELPSW 6
+#define VERSIONSW 3
+ { "Version", 0 },
+#define HELPSW 4
{ "help", 0 },
{ NULL, 0 }
};
static int dat[5];
/*
- * prototypes
- */
-int sc_width (void); /* from termsbr.c */
-
-/*
- * static prototypes
- */
-static int process (char *, int, int);
+** static prototypes
+*/
+static int process(char *, int);
int
-main (int argc, char **argv)
+main(int argc, char **argv)
{
int addrp = 0, normalize = AD_HOST;
- int width = 0, status = 0;
- char *cp, *form = NULL, *format = NULL, *nfs;
+ int status = 0;
+ char *cp, *form = NULL, *fmtstr;
char buf[BUFSIZ], **argp;
char **arguments, *addrs[NADDRS];
#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]);
+ 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);
+ fmtstr = new_fs(form, FORMAT);
- if (width == 0) {
- 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(fmtstr, &fmt);
dat[0] = 0;
dat[1] = 0;
dat[2] = 0;
- dat[3] = width;
+ dat[3] = BUFSIZ;
dat[4] = 0;
for (addrp = 0; addrs[addrp]; addrp++)
- status += process (addrs[addrp], width, normalize);
+ status += process(addrs[addrp], normalize);
- done (status);
+ done(status);
return 1;
}
static int
-process (char *arg, int length, int norm)
+process(char *arg, int norm)
{
int status = 0;
register char *cp;
- char buffer[WBUFSIZ + 1], error[BUFSIZ];
+ char buffer[BUFSIZ + 1], error[BUFSIZ];
register struct comp *cptr;
register struct pqpair *p, *q;
struct pqpair pq;
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, BUFSIZ, 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;
projects / mmh / blobdiff