lock_file.c: close(2) file descriptor on failure, avoiding leak.

[nmh] / uip / ap.c

diff --git a/uip/ap.c b/uip/ap.c
index 105c3fe4d080dd5bca79f77e5f45fdb003ffae93..8265723e8c981581aa1f9e702a5e0b28e81a9dec 100644 (file)
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -1,6 +1,4 @@
-
-/*
- * ap.c -- parse addresses 822-style
+/* 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
@@ -11,19 +9,18 @@
 #include <h/addrsbr.h>
 #include <h/fmt_scan.h>
 #include <h/mts.h>
+#include <h/utils.h>
+#include "sbr/terminal.h"
 
 #define        NADDRS  100
 
 #define        WIDTH   78
-#define        WBUFSIZ BUFSIZ
 
 #define        FORMAT  "%<{error}%{error}: %{text}%|%(putstr(proper{text}))%>"
 
 #define AP_SWITCHES \
     X("form formatfile", 0, FORMSW) \
     X("format string", 5, FMTSW) \
-    X("normalize", 0, NORMSW) \
-    X("nonormalize", 0, NNORMSW) \
     X("width columns", 0, WIDTHSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
@@ -43,30 +40,23 @@ static int dat[5];
 /*
  * static prototypes
  */
-static int process (char *, int, int);
+static int process (char *, int);
 
 
 int
 main (int argc, char **argv)
 {
-    int addrp = 0, normalize = AD_HOST;
-    int width = 0, status = 0;
+    int addrp = 0;
+    int width = -1, status = 0;
     char *cp, *form = NULL, *format = NULL, *nfs;
     char buf[BUFSIZ], **argp;
-    char **arguments, *addrs[NADDRS];
+    char *addrs[NADDRS + 1]; /* Includes terminating NULL. */
 
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
+    if (nmh_init(argv[0], 2)) { return 1; }
 
-    /* read user profile/context */
-    context_read();
-
-    mts_init (invo_name);
-    arguments = getarguments (invo_name, argc, argv, 1);
-    argp = arguments;
+    mts_init ();
 
+    argp = getarguments (invo_name, argc, argv, 1);
     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {
@@ -102,19 +92,11 @@ main (int argc, char **argv)
                        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)
+       if (addrp == NADDRS)
            adios (NULL, "more than %d addresses", NADDRS);
-       else
-           addrs[addrp++] = cp;
+        addrs[addrp++] = cp;
     }
     addrs[addrp] = NULL;
 
@@ -124,14 +106,16 @@ main (int argc, char **argv)
     /* get new format string */
     nfs = new_fs (form, format, FORMAT);
 
-    if (width == 0) {
-       if ((width = sc_width ()) < WIDTH / 2)
+    if (width == -1) {
+       if ((width = sc_width ()) < WIDTH / 2) {
+           /* Default:  width of the terminal, but at least WIDTH/2. */
            width = WIDTH / 2;
+       }
        width -= 2;
+    } else if (width == 0) {
+       /* Unlimited width.  */
+       width = INT_MAX;
     }
-    if (width > WBUFSIZ)
-       width = WBUFSIZ;
-    fmt_norm = normalize;
     fmt_compile (nfs, &fmt, 1);
 
     dat[0] = 0;
@@ -141,10 +125,10 @@ 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);
 
     fmt_free (fmt, 1);
-    done (status);
+    done(!!status);
     return 1;
 }
 
@@ -156,23 +140,22 @@ struct pqpair {
 
 
 static int
-process (char *arg, int length, int norm)
+process (char *arg, int length)
 {
     int        status = 0;
-    register char *cp;
-    char buffer[WBUFSIZ + 1], error[BUFSIZ];
-    register struct comp *cptr;
-    register struct pqpair *p, *q;
+    char *cp;
+    char error[BUFSIZ];
+    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");
-       if ((mp = getm (cp, NULL, 0, norm, error)) == NULL) {
-           p->pq_text = getcpy (cp);
-           p->pq_error = getcpy (error);
+       NEW0(p);
+       if ((mp = getm (cp, NULL, 0, error, sizeof(error))) == NULL) {
+           p->pq_text = mh_xstrdup(cp);
+           p->pq_error = mh_xstrdup(error);
            status++;
        }
        else {
@@ -183,30 +166,30 @@ process (char *arg, int length, int norm)
     }
 
     for (p = pq.pq_next; p; p = q) {
+       charstring_t scanl =
+           charstring_create (length < NMH_BUFSIZ ? length : NMH_BUFSIZ);
+
        cptr = fmt_findcomp ("text");
        if (cptr) {
-           if (cptr->c_text)
-               free(cptr->c_text);
+            free(cptr->c_text);
            cptr->c_text = p->pq_text;
            p->pq_text = NULL;
        }
        cptr = fmt_findcomp ("error");
        if (cptr) {
-           if (cptr->c_text)
-               free(cptr->c_text);
+            free(cptr->c_text);
            cptr->c_text = p->pq_error;
            p->pq_error = NULL;
        }
 
-       fmt_scan (fmt, buffer, sizeof buffer - 1, length, dat);
-       fputs (buffer, stdout);
+       fmt_scan (fmt, scanl, length, dat, NULL);
+       fputs (charstring_buffer (scanl), stdout);
+       charstring_free (scanl);
 
-       if (p->pq_text)
-           free (p->pq_text);
-       if (p->pq_error)
-           free (p->pq_error);
+        free(p->pq_text);
+        free(p->pq_error);
        q = p->pq_next;
-       free ((char *) p);
+       free(p);
     }
 
     return status;