Fixed typo.

[nmh] / uip / ap.c

diff --git a/uip/ap.c b/uip/ap.c
index 1148871d72ddc472bb3b8606361fc757f0e5fb9f..9250b08aa1cd587f5e108512fb7f2bcae0d2dd0b 100644 (file)
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -11,11 +11,11 @@
 #include <h/addrsbr.h>
 #include <h/fmt_scan.h>
 #include <h/mts.h>
 #include <h/addrsbr.h>
 #include <h/fmt_scan.h>
 #include <h/mts.h>

+#include <h/utils.h>

 
 #define        NADDRS  100
 
 #define        WIDTH   78
 
 #define        NADDRS  100
 
 #define        WIDTH   78

-#define        WBUFSIZ BUFSIZ

 
 #define        FORMAT  "%<{error}%{error}: %{text}%|%(putstr(proper{text}))%>"
 
 
 #define        FORMAT  "%<{error}%{error}: %{text}%|%(putstr(proper{text}))%>"
 


@@ -48,14 +48,14 @@ int
 main (int argc, char **argv)
 {
     int addrp = 0;
 main (int argc, char **argv)
 {
     int addrp = 0;

-    int width = 0, status = 0;
+    int width = -1, status = 0;

     char *cp, *form = NULL, *format = NULL, *nfs;
     char buf[BUFSIZ], **argp;
     char **arguments, *addrs[NADDRS];
 
     if (nmh_init(argv[0], 1)) { return 1; }
 
     char *cp, *form = NULL, *format = NULL, *nfs;
     char buf[BUFSIZ], **argp;
     char **arguments, *addrs[NADDRS];
 
     if (nmh_init(argv[0], 1)) { return 1; }
 

-    mts_init (invo_name);
+    mts_init ();

     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 


@@ -109,13 +109,16 @@ main (int argc, char **argv)
     /* get new format string */
     nfs = new_fs (form, format, FORMAT);
 
     /* 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 = WIDTH / 2;

+       }

        width -= 2;
        width -= 2;

+    } else if (width == 0) {
+       /* Unlimited width.  */
+       width = INT_MAX;

     }
     }

-    if (width > WBUFSIZ)
-       width = WBUFSIZ;

     fmt_compile (nfs, &fmt, 1);
 
     dat[0] = 0;
     fmt_compile (nfs, &fmt, 1);
 
     dat[0] = 0;


@@ -152,7 +155,7 @@ process (char *arg, int length)
 
     (q = &pq)->pq_next = NULL;
     while ((cp = getname (arg))) {
 
     (q = &pq)->pq_next = NULL;
     while ((cp = getname (arg))) {

-       if ((p = (struct pqpair *) calloc ((size_t) 1, sizeof(*p))) == NULL)
+       if ((p = (struct pqpair *) mh_xcalloc ((size_t) 1, sizeof(*p))) == NULL)

            adios (NULL, "unable to allocate pqpair memory");
        if ((mp = getm (cp, NULL, 0, error, sizeof(error))) == NULL) {
            p->pq_text = getcpy (cp);
            adios (NULL, "unable to allocate pqpair memory");
        if ((mp = getm (cp, NULL, 0, error, sizeof(error))) == NULL) {
            p->pq_text = getcpy (cp);


@@ -167,19 +170,20 @@ process (char *arg, int length)
     }
 
     for (p = pq.pq_next; p; p = q) {
     }
 
     for (p = pq.pq_next; p; p = q) {

-       charstring_t scanl = charstring_create (length);
+       charstring_t scanl =
+           charstring_create (length < NMH_BUFSIZ ? length : NMH_BUFSIZ);

 
        cptr = fmt_findcomp ("text");
        if (cptr) {
            if (cptr->c_text)
 
        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)
            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;
        }
            cptr->c_text = p->pq_error;
            p->pq_error = NULL;
        }