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

[mmh] / uip / scan.c

diff --git a/uip/scan.c b/uip/scan.c
index f8e2e11..cfcd3e4 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -20,15 +20,13 @@ static struct swit switches[] = {
        { "noclear", 0 },
 #define FORMSW  2
        { "form formatfile", 0 },
        { "noclear", 0 },
 #define FORMSW  2
        { "form formatfile", 0 },

-#define FMTSW  3
-       { "format string", 5 },
-#define WIDTHSW  4
+#define WIDTHSW  3

        { "width columns", 0 },
        { "width columns", 0 },

-#define FILESW  5
+#define FILESW  4

        { "file file", 4 },
        { "file file", 4 },

-#define VERSIONSW 6
+#define VERSIONSW 5

        { "version", 0 },
        { "version", 0 },

-#define HELPSW  7
+#define HELPSW  6

        { "help", 0 },
        { NULL, 0 }
 };
        { "help", 0 },
        { NULL, 0 }
 };

@@ -48,7 +46,7 @@ main(int argc, char **argv)
        int i, state, msgnum;
        int seqnum[NUMATTRS], unseen, num_unseen_seq = 0;
        char *cp, *maildir, *file = NULL, *folder = NULL;
        int i, state, msgnum;
        int seqnum[NUMATTRS], unseen, num_unseen_seq = 0;
        char *cp, *maildir, *file = NULL, *folder = NULL;

-       char *form = NULL, *format = NULL, buf[BUFSIZ];
+       char *form = NULL, buf[BUFSIZ];

        char **argp, *nfs, **arguments;
        struct msgs_array msgs = { 0, 0, NULL };
        struct msgs *mp;
        char **argp, *nfs, **arguments;
        struct msgs_array msgs = { 0, 0, NULL };
        struct msgs *mp;

@@ -96,13 +94,6 @@ main(int argc, char **argv)
                                if (!(form = *argp++) || *form == '-')
                                        adios(NULL, "missing argument to %s",
                                                        argp[-2]);
                                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:
                                continue;
 
                        case WIDTHSW:

@@ -133,7 +124,7 @@ main(int argc, char **argv)
        /*
        ** Get new format string.  Must be before chdir().
        */
        /*
        ** Get new format string.  Must be before chdir().
        */

-       nfs = new_fs(form, format, NULL, FORMAT);
+       nfs = new_fs(form, FORMAT);

 
        /*
        ** We are scanning a maildrop file
 
        /*
        ** We are scanning a maildrop file