X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/38615191e71744b066425e0c44412b62dbe49cc2..b3df58528443af8b4f25748bef8ca98852af9ba2:/uip/ap.c

diff --git a/uip/ap.c b/uip/ap.c
index ea2d36d7..80ce8a3f 100644
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -2,8 +2,6 @@
 /*
  * 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.
@@ -43,11 +41,6 @@ static struct format *fmt;
 
 static int dat[5];
 
-/*
- * prototypes
- */
-int sc_width (void);  /* from termsbr.c */
-
 /*
  * static prototypes
  */
@@ -89,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 == '-')
@@ -140,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;
@@ -151,6 +144,7 @@ main (int argc, char **argv)
     for (addrp = 0; addrs[addrp]; addrp++)
 	status += process (addrs[addrp], width, normalize);
 
+    fmt_free (fmt, 1);
     done (status);
     return 1;
 }
@@ -190,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;