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

[mmh] / uip / dist.c

diff --git a/uip/dist.c b/uip/dist.c
index 4eba2eb..3db8cfc 100644 (file)
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -17,17 +17,13 @@ static struct swit switches[] = {
        { "noannotate", 0 },
 #define EDITRSW  2
        { "editor editor", 0 },
-#define NEDITSW  3
-       { "noedit", 0 },
-#define FORMSW  4
+#define FORMSW  3
        { "form formfile", 0 },
-#define WHATSW  5
+#define WHATSW  4
        { "whatnowproc program", 0 },
-#define NWHATSW  6
-       { "nowhatnowproc", 0 },
-#define VERSIONSW  7
-       { "version", 0 },
-#define HELPSW  8
+#define VERSIONSW  5
+       { "Version", 0 },
+#define HELPSW  6
        { "help", 0 },
        { NULL, 0 }
 };
@@ -36,8 +32,8 @@ static struct swit switches[] = {
 int
 main(int argc, char **argv)
 {
-       int anot = 0, nedit = 0;
-       int nwhat = 0, in, out;
+       int anot = 0;
+       int in, out;
        char *cp, *cwd, *maildir, *msgnam;
        char *ed = NULL, *folder = NULL;
        char *form = NULL, *msg = NULL, buf[BUFSIZ], drft[BUFSIZ];
@@ -84,20 +80,12 @@ main(int argc, char **argv)
                                if (!(ed = *argp++) || *ed == '-')
                                        adios(NULL, "missing argument to %s",
                                                        argp[-2]);
-                               nedit = 0;
-                               continue;
-                       case NEDITSW:
-                               nedit++;
                                continue;
 
                        case WHATSW:
                                if (!(whatnowproc = *argp++) || *whatnowproc == '-')
                                        adios(NULL, "missing argument to %s",
                                                        argp[-2]);
-                               nwhat = 0;
-                               continue;
-                       case NWHATSW:
-                               nwhat++;
                                continue;
 
                        case FORMSW:
@@ -127,7 +115,7 @@ main(int argc, char **argv)
                adios(drft, "unable to create");
 
        fmtstr = new_fs(form, distcomps);
-       if (write(out, fmtstr, strlen(fmtstr)) != strlen(fmtstr)) {
+       if (write(out, fmtstr, strlen(fmtstr)) != (int)strlen(fmtstr)) {
                adios(drft, "error writing");
        }
        close(out);
@@ -165,10 +153,7 @@ main(int argc, char **argv)
        seq_save(mp);  /* synchronize sequences  */
        context_save();
 
-       if (nwhat)
-               done(0);
-       what_now(ed, nedit, NOUSE, drft, msgnam, 1, mp,
-                       anot ? "Resent" : NULL, cwd);
+       what_now(ed, NOUSE, drft, msgnam, 1, mp, anot ? "Resent" : NULL, cwd);
        done(1);
        return 1;
 }