X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/017a82124bf2ea39ced5aa4c8f969c18b3c2fb90..fa194d6d12bd0d4d2196508cbb0e5bfddb6efe37:/uip/ap.c

diff --git a/uip/ap.c b/uip/ap.c
index dde11759..fdb47e2a 100644
--- 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
 
@@ -39,11 +41,6 @@ static struct format *fmt;
 
 static int dat[5];
 
-/*
- * prototypes
- */
-int sc_width (void);  /* from termsbr.c */
-
 /*
  * static prototypes
  */
@@ -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 == '-')
@@ -147,7 +144,8 @@ main (int argc, char **argv)
     for (addrp = 0; addrs[addrp]; addrp++)
 	status += process (addrs[addrp], width, normalize);
 
-    return done (status);
+    done (status);
+    return 1;
 }
 
 struct pqpair {
@@ -192,7 +190,7 @@ process (char *arg, int length, int norm)
 	if (cptr)
 	    cptr->c_text = p->pq_error;
 
-	fmt_scan (fmt, buffer, length, dat);
+	fmt_scan (fmt, buffer, sizeof buffer - 1, length, dat);
 	fputs (buffer, stdout);
 
 	free (p->pq_text);