crawl_folders.h: Base header on implementation.

[nmh] / uip / ap.c

diff --git a/uip/ap.c b/uip/ap.c
index 7e16b926354d82963b521fa4551dbf21098fa8b8..83295af9625b2ffaf6502be677217256b367398e 100644 (file)
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -1,75 +1,70 @@
-
-/*
- * ap.c -- parse addresses 822-style
+/* 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 "h/mh.h"
+#include "sbr/getarguments.h"
+#include "sbr/smatch.h"
+#include "sbr/getcpy.h"
+#include "sbr/ambigsw.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
+#include "h/addrsbr.h"
+#include "h/fmt_scan.h"
+#include "h/mts.h"
+#include "h/done.h"
+#include "h/utils.h"
+#include "sbr/terminal.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}))%>"
 

-static struct swit switches[] = {
-#define        FORMSW  0
-    { "form formatfile", 0 },
-#define        FMTSW   1
-    { "format string", 5 },
-#define        NORMSW  2
-    { "normalize", 0 },
-#define        NNORMSW 3
-    { "nonormalize", 0 },
-#define        WIDTHSW 4
-    { "width columns", 0 },
-#define VERSIONSW 5
-    { "version", 0 },
-#define        HELPSW  6
-    { "help", 4 },
-    { NULL, 0 }
-};
+#define AP_SWITCHES \
+    X("form formatfile", 0, FORMSW) \
+    X("format string", 5, FMTSW) \
+    X("width columns", 0, WIDTHSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(AP);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(AP, switches);
+#undef X

 
 static struct format *fmt;
 
 static int dat[5];
 
 
 static struct format *fmt;
 
 static int dat[5];
 

-/*
- * prototypes
- */
-int sc_width (void);  /* from termsbr.c */
-

 /*
  * 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 *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], '/');
+    char *addrs[NADDRS + 1]; /* Includes terminating NULL. */

 
 

-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], true, false)) { return 1; }

 
 

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

 
 

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

     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {
     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {


@@ -78,64 +73,58 @@ main (int argc, char **argv)
                    done (1);
 
                case UNKWNSW: 
                    done (1);
 
                case UNKWNSW: 

-                   adios (NULL, "-%s unknown", cp);
+                   die("-%s unknown", cp);

 
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [switches] addrs ...",
                        invo_name);
                    print_help (buf, switches, 1);
 
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [switches] addrs ...",
                        invo_name);
                    print_help (buf, switches, 1);

-                   done (1);
+                   done (0);

                case VERSIONSW:
                    print_version (invo_name);
                case VERSIONSW:
                    print_version (invo_name);

-                   done (1);
+                   done (0);

 
                case FORMSW: 
                    if (!(form = *argp++) || *form == '-')
 
                case FORMSW: 
                    if (!(form = *argp++) || *form == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    format = NULL;
                    continue;
                case FMTSW: 
                    if (!(format = *argp++) || *format == '-')
                    format = NULL;
                    continue;
                case FMTSW: 
                    if (!(format = *argp++) || *format == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    form = NULL;
                    continue;
 
                case WIDTHSW: 
                    if (!(cp = *argp++) || *cp == '-')
                    form = NULL;
                    continue;
 
                case WIDTHSW: 
                    if (!(cp = *argp++) || *cp == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    width = atoi (cp);
                    continue;
                    width = atoi (cp);
                    continue;

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

            }
        }
            }
        }

-       if (addrp > NADDRS)
-           adios (NULL, "more than %d addresses", NADDRS);
-       else
-           addrs[addrp++] = cp;
+       if (addrp == NADDRS)
+           die("more than %d addresses", NADDRS);
+        addrs[addrp++] = cp;

     }
     addrs[addrp] = NULL;
 
     if (addrp == 0)
     }
     addrs[addrp] = NULL;
 
     if (addrp == 0)

-       adios (NULL, "usage: %s [switches] addrs ...", invo_name);
+       die("usage: %s [switches] addrs ...", invo_name);

 
     /* 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);
+    fmt_compile (nfs, &fmt, 1);

 
     dat[0] = 0;
     dat[1] = 0;
 
     dat[0] = 0;
     dat[1] = 0;


@@ -144,9 +133,11 @@ 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);

 
 

-    done (status);
+    fmt_free (fmt, 1);
+    done(!!status);
+    return 1;

 }
 
 struct pqpair {
 }
 
 struct pqpair {


@@ -157,23 +148,22 @@ struct pqpair {
 
 
 static int
 
 
 static int

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

 {
     int        status = 0;
 {
     int        status = 0;

-    register char *cp;
-    char buffer[WBUFSIZ + 1], error[BUFSIZ];
-    register struct comp *cptr;
-    register struct pqpair *p, *q;
+    char *cp;
+    char error[BUFSIZ];
+    struct comp *cptr;
+    struct pqpair *p, *q;

     struct pqpair pq;
     struct pqpair pq;

-    register struct mailname *mp;
+    struct mailname *mp;

 
     (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) {
-           p->pq_text = getcpy (cp);
-           p->pq_error = getcpy (error);
+       NEW0(p);
+       if ((mp = getm (cp, NULL, 0, error, sizeof(error))) == NULL) {
+           p->pq_text = mh_xstrdup(cp);
+           p->pq_error = mh_xstrdup(error);

            status++;
        }
        else {
            status++;
        }
        else {


@@ -184,21 +174,30 @@ process (char *arg, int length, int norm)
     }
 
     for (p = pq.pq_next; p; p = q) {
     }
 
     for (p = pq.pq_next; p; p = q) {

-       FINDCOMP (cptr, "text");
-       if (cptr)
+       charstring_t scanl =
+           charstring_create (length < NMH_BUFSIZ ? length : NMH_BUFSIZ);
+
+       cptr = fmt_findcomp ("text");
+       if (cptr) {
+            free(cptr->c_text);

            cptr->c_text = p->pq_text;
            cptr->c_text = p->pq_text;

-       FINDCOMP (cptr, "error");
-       if (cptr)
+           p->pq_text = NULL;
+       }
+       cptr = fmt_findcomp ("error");
+       if (cptr) {
+            free(cptr->c_text);

            cptr->c_text = p->pq_error;
            cptr->c_text = p->pq_error;

+           p->pq_error = NULL;
+       }

 
 

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

 
 

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

        q = p->pq_next;
        q = p->pq_next;

-       free ((char *) p);
+       free(p);

     }
 
     return status;
     }
 
     return status;