Refined commit ed3214f1518b36c8b96a1a17be4af0a708ea25e3 to only

[nmh] / uip / ap.c

diff --git a/uip/ap.c b/uip/ap.c
index 80ce8a3fa43ac7087c2d18971979e48fc8fa13bb..c8cf4b25d120327c8df257ed152c4d0f5c1f8861 100644 (file)
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -19,23 +19,20 @@
 
 #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", 0 },
-    { 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;
 
@@ -44,25 +41,19 @@ static int dat[5];
 /*
  * static prototypes
  */
-static int process (char *, int, int);
+static int process (char *, int);
 
 
 int
 main (int argc, char **argv)
 {
-    int addrp = 0, normalize = AD_HOST;
+    int addrp = 0;
     int width = 0, status = 0;
     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], '/');
-
-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], 1)) { return 1; }
 
     mts_init (invo_name);
     arguments = getarguments (invo_name, argc, argv, 1);
@@ -103,13 +94,6 @@ main (int argc, char **argv)
                        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)
@@ -132,7 +116,6 @@ main (int argc, char **argv)
     }
     if (width > WBUFSIZ)
        width = WBUFSIZ;
-    fmt_norm = normalize;
     fmt_compile (nfs, &fmt, 1);
 
     dat[0] = 0;
@@ -142,7 +125,7 @@ main (int argc, char **argv)
     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);
@@ -157,7 +140,7 @@ struct pqpair {
 
 
 static int
-process (char *arg, int length, int norm)
+process (char *arg, int length)
 {
     int        status = 0;
     register char *cp;
@@ -171,7 +154,7 @@ process (char *arg, int length, int norm)
     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) {
+       if ((mp = getm (cp, NULL, 0, error, sizeof(error))) == NULL) {
            p->pq_text = getcpy (cp);
            p->pq_error = getcpy (error);
            status++;
@@ -199,7 +182,7 @@ process (char *arg, int length, int norm)
            p->pq_error = NULL;
        }
 
-       fmt_scan (fmt, buffer, sizeof buffer - 1, length, dat);
+       fmt_scan (fmt, buffer, sizeof buffer - 1, length, dat, NULL);
        fputs (buffer, stdout);
 
        if (p->pq_text)