Add const specifier to mh_xstrdup()'s src parameter.

[nmh] / uip / ap.c

diff --git a/uip/ap.c b/uip/ap.c
index c42d732c858c49ac659b3acf30d8e92eef19c56e..92b765afeec566ee04311af73125d650df8bca93 100644 (file)
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -11,19 +11,17 @@
 #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 AP_SWITCHES \
     X("form formatfile", 0, FORMSW) \
     X("format string", 5, FMTSW) \
 
 #define        FORMAT  "%<{error}%{error}: %{text}%|%(putstr(proper{text}))%>"
 
 #define AP_SWITCHES \
     X("form formatfile", 0, FORMSW) \
     X("format string", 5, FMTSW) \

-    X("normalize", 0, NORMSW) \
-    X("nonormalize", 0, NNORMSW) \

     X("width columns", 0, WIDTHSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
     X("width columns", 0, WIDTHSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \


@@ -43,27 +41,21 @@ static int dat[5];
 /*
  * static prototypes
  */
 /*
  * static prototypes
  */

-static int process (char *, int, int);
+static int process (char *, int);

 
 
 int
 main (int argc, char **argv)
 {
 
 
 int
 main (int argc, char **argv)
 {

-    int addrp = 0, normalize = AD_HOST;
-    int width = 0, status = 0;
+    int addrp = 0;
+    int width = -1, status = 0;

     char *cp, *form = NULL, *format = NULL, *nfs;
     char buf[BUFSIZ], **argp;
     char **arguments, *addrs[NADDRS];
 
     char *cp, *form = NULL, *format = NULL, *nfs;
     char buf[BUFSIZ], **argp;
     char **arguments, *addrs[NADDRS];
 

-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
+    if (nmh_init(argv[0], 2)) { return 1; }

 
 

-    /* read user profile/context */
-    context_read();
-
-    mts_init (invo_name);
+    mts_init ();

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


@@ -102,13 +94,6 @@ main (int argc, char **argv)
                        adios (NULL, "missing argument to %s", argp[-2]);
                    width = atoi (cp);
                    continue;
                        adios (NULL, "missing argument to %s", argp[-2]);
                    width = atoi (cp);
                    continue;

-
-               case NORMSW: 
-                   normalize = AD_HOST;
-                   continue;
-               case NNORMSW: 
-                   normalize = AD_NHST;
-                   continue;

            }
        }
        if (addrp > NADDRS)
            }
        }
        if (addrp > NADDRS)


@@ -124,14 +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_norm = normalize;

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


@@ -141,7 +128,7 @@ main (int argc, char **argv)
     dat[4] = 0;
 
     for (addrp = 0; addrs[addrp]; addrp++)
     dat[4] = 0;
 
     for (addrp = 0; addrs[addrp]; addrp++)

-       status += process (addrs[addrp], width, normalize);
+       status += process (addrs[addrp], width);

 
     fmt_free (fmt, 1);
     done (status);
 
     fmt_free (fmt, 1);
     done (status);


@@ -156,11 +143,11 @@ struct pqpair {
 
 
 static int
 
 
 static int

-process (char *arg, int length, int norm)
+process (char *arg, int length)

 {
     int        status = 0;
     register char *cp;
 {
     int        status = 0;
     register char *cp;

-    char buffer[WBUFSIZ + 1], error[BUFSIZ];
+    char error[BUFSIZ];

     register struct comp *cptr;
     register struct pqpair *p, *q;
     struct pqpair pq;
     register struct comp *cptr;
     register struct pqpair *p, *q;
     struct pqpair pq;


@@ -168,9 +155,8 @@ process (char *arg, int length, int norm)
 
     (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)
-           adios (NULL, "unable to allocate pqpair memory");
-       if ((mp = getm (cp, NULL, 0, norm, error)) == NULL) {
+       NEW0(p);
+       if ((mp = getm (cp, NULL, 0, error, sizeof(error))) == NULL) {

            p->pq_text = getcpy (cp);
            p->pq_error = getcpy (error);
            status++;
            p->pq_text = getcpy (cp);
            p->pq_error = getcpy (error);
            status++;


@@ -183,23 +169,27 @@ process (char *arg, int length, int norm)
     }
 
     for (p = pq.pq_next; p; p = q) {
     }
 
     for (p = pq.pq_next; p; p = q) {

+       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;
        }
 

-       fmt_scan (fmt, buffer, sizeof buffer - 1, length, dat, NULL);
-       fputs (buffer, stdout);
+       fmt_scan (fmt, scanl, length, dat, NULL);
+       fputs (charstring_buffer (scanl), stdout);
+       charstring_free (scanl);

 
        if (p->pq_text)
            free (p->pq_text);
 
        if (p->pq_text)
            free (p->pq_text);