Changed msg_style and msg_delim to be file static to m_getfld.c

[mmh] / uip / ap.c

diff --git a/uip/ap.c b/uip/ap.c
index 2abba4b..80ce8a3 100644 (file)
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -2,13 +2,15 @@
 /*
  * ap.c -- parse addresses 822-style
  *
- * $Id$
+ * 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 <zotnet/mts/mts.h>
+#include <h/mts.h>
 
 #define        NADDRS  100
 
@@ -31,7 +33,7 @@ static struct swit switches[] = {
 #define VERSIONSW 5
     { "version", 0 },
 #define        HELPSW  6
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -40,11 +42,6 @@ static struct format *fmt;
 static int dat[5];
 
 /*
- * prototypes
- */
-int sc_width (void);  /* from termsbr.c */
-
-/*
  * static prototypes
  */
 static int process (char *, int, int);
@@ -85,10 +82,10 @@ main (int argc, char **argv)
                    snprintf (buf, sizeof(buf), "%s [switches] addrs ...",
                        invo_name);
                    print_help (buf, switches, 1);
-                   done (1);
+                   done (0);
                case VERSIONSW:
                    print_version (invo_name);
-                   done (1);
+                   done (0);
 
                case FORMSW: 
                    if (!(form = *argp++) || *form == '-')
@@ -136,7 +133,7 @@ main (int argc, char **argv)
     if (width > WBUFSIZ)
        width = WBUFSIZ;
     fmt_norm = normalize;
-    fmt_compile (nfs, &fmt);
+    fmt_compile (nfs, &fmt, 1);
 
     dat[0] = 0;
     dat[1] = 0;
@@ -147,7 +144,9 @@ main (int argc, char **argv)
     for (addrp = 0; addrs[addrp]; addrp++)
        status += process (addrs[addrp], width, normalize);
 
-    return done (status);
+    fmt_free (fmt, 1);
+    done (status);
+    return 1;
 }
 
 struct pqpair {
@@ -185,17 +184,26 @@ process (char *arg, int length, int norm)
     }
 
     for (p = pq.pq_next; p; p = q) {
-       FINDCOMP (cptr, "text");
-       if (cptr)
+       cptr = fmt_findcomp ("text");
+       if (cptr) {
+           if (cptr->c_text)
+               free(cptr->c_text);
            cptr->c_text = p->pq_text;
-       FINDCOMP (cptr, "error");
-       if (cptr)
+           p->pq_text = NULL;
+       }
+       cptr = fmt_findcomp ("error");
+       if (cptr) {
+           if (cptr->c_text)
+               free(cptr->c_text);
            cptr->c_text = p->pq_error;
+           p->pq_error = NULL;
+       }
 
-       fmt_scan (fmt, buffer, length, dat);
+       fmt_scan (fmt, buffer, sizeof buffer - 1, length, dat);
        fputs (buffer, stdout);
 
-       free (p->pq_text);
+       if (p->pq_text)
+           free (p->pq_text);
        if (p->pq_error)
            free (p->pq_error);
        q = p->pq_next;