Removed `-format string' switches but made -form accept `=formatstring'.

[mmh] / uip / ap.c

diff --git a/uip/ap.c b/uip/ap.c
index a4e2189..b49cdc2 100644 (file)
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -15,22 +15,20 @@
 #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
+#define WIDTHSW 3
        { "width columns", 0 },
-#define VERSIONSW 5
+#define VERSIONSW 4
        { "version", 0 },
-#define HELPSW 6
+#define HELPSW 5
        { "help", 0 },
        { NULL, 0 }
 };
@@ -55,7 +53,7 @@ main(int argc, char **argv)
 {
        int addrp = 0, normalize = AD_HOST;
        int width = 0, status = 0;
-       char *cp, *form = NULL, *format = NULL, *nfs;
+       char *cp, *form = NULL, *nfs;
        char buf[BUFSIZ], **argp;
        char **arguments, *addrs[NADDRS];
 
@@ -91,12 +89,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:
@@ -124,7 +116,7 @@ main(int argc, char **argv)
                adios(NULL, "usage: %s [switches] addrs ...", invo_name);
 
        /* get new format string */
-       nfs = new_fs(form, format, NULL, FORMAT);
+       nfs = new_fs(form, FORMAT);
 
        if (width == 0) {
                if ((width = sc_width()) < WIDTH / 2)