Renamed -version switch to -Version to remove the conflict with -verbose.

[mmh] / uip / ap.c

diff --git a/uip/ap.c b/uip/ap.c
index 4f7f760..3bb2bf0 100644 (file)
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -9,29 +9,21 @@
 #include <h/mh.h>
 #include <h/addrsbr.h>
 #include <h/fmt_scan.h>
-#include <h/mts.h>
 
 #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
+#define NORMSW 1
        { "normalize", 0 },
-#define NNORMSW 3
+#define NNORMSW 2
        { "nonormalize", 0 },
-#define WIDTHSW 4
-       { "width columns", 0 },
-#define VERSIONSW 5
-       { "version", 0 },
-#define HELPSW 6
+#define VERSIONSW 3
+       { "Version", 0 },
+#define HELPSW 4
        { "help", 0 },
        { NULL, 0 }
 };
@@ -41,22 +33,17 @@ static struct format *fmt;
 static int dat[5];
 
 /*
-** prototypes
-*/
-int sc_width(void);  /* from termsbr.c */
-
-/*
 ** 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 width = 0, status = 0;
-       char *cp, *form = NULL, *format = NULL, *nfs;
+       int status = 0;
+       char *cp, *form = NULL, *fmtstr;
        char buf[BUFSIZ], **argp;
        char **arguments, *addrs[NADDRS];
 
@@ -92,18 +79,6 @@ main(int argc, char **argv)
                        case FORMSW:
                                if (!(form = *argp++) || *form == '-')
                                        adios(NULL, "missing argument to %s", argp[-2]);
-                               format = NULL;
-                               continue;
-                       case FMTSW:
-                               if (!(format = *argp++) || *format == '-')
-                                       adios(NULL, "missing argument to %s", argp[-2]);
-                               form = NULL;
-                               continue;
-
-                       case WIDTHSW:
-                               if (!(cp = *argp++) || *cp == '-')
-                                       adios(NULL, "missing argument to %s", argp[-2]);
-                               width = atoi(cp);
                                continue;
 
                        case NORMSW:
@@ -125,26 +100,19 @@ main(int argc, char **argv)
                adios(NULL, "usage: %s [switches] addrs ...", invo_name);
 
        /* get new format string */
-       nfs = new_fs(form, format, FORMAT);
+       fmtstr = new_fs(form, FORMAT);
 
-       if (width == 0) {
-               if ((width = sc_width()) < WIDTH / 2)
-                       width = WIDTH / 2;
-               width -= 2;
-       }
-       if (width > WBUFSIZ)
-               width = WBUFSIZ;
        fmt_norm = normalize;
-       fmt_compile(nfs, &fmt);
+       fmt_compile(fmtstr, &fmt);
 
        dat[0] = 0;
        dat[1] = 0;
        dat[2] = 0;
-       dat[3] = width;
+       dat[3] = BUFSIZ;
        dat[4] = 0;
 
        for (addrp = 0; addrs[addrp]; addrp++)
-               status += process(addrs[addrp], width, normalize);
+               status += process(addrs[addrp], normalize);
 
        done(status);
        return 1;
@@ -158,11 +126,11 @@ struct pqpair {
 
 
 static int
-process(char *arg, int length, int norm)
+process(char *arg, int norm)
 {
        int status = 0;
        register char *cp;
-       char buffer[WBUFSIZ + 1], error[BUFSIZ];
+       char buffer[BUFSIZ + 1], error[BUFSIZ];
        register struct comp *cptr;
        register struct pqpair *p, *q;
        struct pqpair pq;
@@ -192,7 +160,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, BUFSIZ, dat);
                fputs(buffer, stdout);
 
                free(p->pq_text);