X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fap.c;h=80ce8a3fa43ac7087c2d18971979e48fc8fa13bb;hb=492101aee1185135f239b3aabd5b2494f748c931;hp=a0f7f778f6517b9c126bc0e62d376c86ed3afde3;hpb=5dd6771b28c257af405d7248639ed0e3bcdce38b;p=mmh

diff --git a/uip/ap.c b/uip/ap.c
index a0f7f77..80ce8a3 100644
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -42,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);
@@ -87,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 == '-')
@@ -138,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;
@@ -149,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;
 }
@@ -188,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;