Added scan and inc from mbox with multiple messages.

[nmh] / uip / whatnowsbr.c

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index ad7570a532f3c4e8eee748be38d84915855e9f92..9a9fec1b4f3ee4709695112ba9bd624a44251c9d 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -44,66 +44,54 @@
 #include <h/mime.h>
 #include <h/utils.h>
 
 #include <h/mime.h>
 #include <h/utils.h>
 

-static struct swit whatnowswitches[] = {
-#define        DFOLDSW                 0
-    { "draftfolder +folder", 0 },
-#define        DMSGSW                  1
-    { "draftmessage msg", 0 },
-#define        NDFLDSW                 2
-    { "nodraftfolder", 0 },
-#define        EDITRSW                 3
-    { "editor editor", 0 },
-#define        NEDITSW                 4
-    { "noedit", 0 },
-#define        PRMPTSW                 5
-    { "prompt string", 4 },
-#define VERSIONSW               6
-    { "version", 0 },
-#define        HELPSW                  7
-    { "help", 0 },
-#define        ATTACHSW                8
-    { "attach header-field-name", 0 },
-    { NULL, 0 }
-};
+#define WHATNOW_SWITCHES \
+    X("draftfolder +folder", 0, DFOLDSW) \
+    X("draftmessage msg", 0, DMSGSW) \
+    X("nodraftfolder", 0, NDFLDSW) \
+    X("editor editor", 0, EDITRSW) \
+    X("noedit", 0, NEDITSW) \
+    X("prompt string", 4, PRMPTSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+    X("attach header-field-name", 0, ATTACHSW) \
+    X("noattach", 0, NOATTACHSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(WHATNOW);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(WHATNOW, whatnowswitches);
+#undef X

 
 /*
  * Options at the "whatnow" prompt
  */
 
 /*
  * Options at the "whatnow" prompt
  */

-static struct swit aleqs[] = {
-#define        EDITSW                         0
-    { "edit [<editor> <switches>]", 0 },
-#define        REFILEOPT                      1
-    { "refile [<switches>] +folder", 0 },
-#define BUILDMIMESW                    2
-    { "mime [<switches>]", 0 },
-#define        DISPSW                         3
-    { "display [<switches>]", 0 },
-#define        LISTSW                         4
-    { "list [<switches>]", 0 },
-#define        SENDSW                         5
-    { "send [<switches>]", 0 },
-#define        PUSHSW                         6
-    { "push [<switches>]", 0 },
-#define        WHOMSW                         7
-    { "whom [<switches>]", 0 },
-#define        QUITSW                         8
-    { "quit [-delete]", 0 },
-#define DELETESW                       9
-    { "delete", 0 },
-#define        CDCMDSW                       10
-    { "cd [directory]", 0 },
-#define        PWDCMDSW                      11
-    { "pwd", 0 },
-#define        LSCMDSW                       12
-    { "ls", 0 },
-#define        ATTACHCMDSW                   13
-    { "attach", 0 },
-#define        DETACHCMDSW                   14
-    { "detach [-n]", 2 },
-#define        ALISTCMDSW                    15
-    { "alist [-ln] ", 2 },
-    { NULL, 0 }
-};
+#define PROMPT_SWITCHES \
+    X("edit [<editor> <switches>]", 0, EDITSW) \
+    X("refile [<switches>] +folder", 0, REFILEOPT) \
+    X("mime [<switches>]", 0, BUILDMIMESW) \
+    X("display [<switches>]", 0, DISPSW) \
+    X("list [<switches>]", 0, LISTSW) \
+    X("send [<switches>]", 0, SENDSW) \
+    X("push [<switches>]", 0, PUSHSW) \
+    X("whom [<switches>]", 0, WHOMSW) \
+    X("quit [-delete]", 0, QUITSW) \
+    X("delete", 0, DELETESW) \
+    X("cd [directory]", 0, CDCMDSW) \
+    X("pwd", 0, PWDCMDSW) \
+    X("ls", 2, LSCMDSW) \
+    X("attach", 0, ATTACHCMDSW) \
+    X("detach [-n]", 2, DETACHCMDSW) \
+    X("alist [-ln] ", 2, ALISTCMDSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(PROMPT);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(PROMPT, aleqs);
+#undef X

 
 static char *myprompt = "\nWhat now? ";
 
 
 static char *myprompt = "\nWhat now? ";
 


@@ -111,14 +99,14 @@ static char *myprompt = "\nWhat now? ";
  * static prototypes
  */
 static int editfile (char **, char **, char *, int, struct msgs *,
  * static prototypes
  */
 static int editfile (char **, char **, char *, int, struct msgs *,

-       char *, char *, int);
+       char *, char *, int, int);

 static int sendfile (char **, char *, int);
 static void sendit (char *, char **, char *, int);
 static int buildfile (char **, char *);
 static int check_draft (char *);
 static int whomfile (char **, char *);
 static int removefile (char *);
 static int sendfile (char **, char *, int);
 static void sendit (char *, char **, char *, int);
 static int buildfile (char **, char *);
 static int check_draft (char *);
 static int whomfile (char **, char *);
 static int removefile (char *);

-static void writelscmd(char *, int, char **);
+static void writelscmd(char *, int, char *, char **);

 static void writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp);
 static FILE* popen_in_dir(const char *dir, const char *cmd, const char *type);
 static int system_in_dir(const char *dir, const char *cmd);
 static void writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp);
 static FILE* popen_in_dir(const char *dir, const char *cmd, const char *type);
 static int system_in_dir(const char *dir, const char *cmd);


@@ -132,16 +120,16 @@ static int copyf (char *, char *);
 int
 WhatNow (int argc, char **argv)
 {
 int
 WhatNow (int argc, char **argv)
 {

-    int isdf = 0, nedit = 0, use = 0;
+    int isdf = 0, nedit = 0, use = 0, atfile = 1;

     char *cp, *dfolder = NULL, *dmsg = NULL;
     char *ed = NULL, *drft = NULL, *msgnam = NULL;
     char buf[BUFSIZ], prompt[BUFSIZ];
     char **argp, **arguments;
     struct stat st;
     char *cp, *dfolder = NULL, *dmsg = NULL;
     char *ed = NULL, *drft = NULL, *msgnam = NULL;
     char buf[BUFSIZ], prompt[BUFSIZ];
     char **argp, **arguments;
     struct stat st;

-    char       *attach = (char *)0;    /* attachment header field name */
-    char       cwd[MAXPATHLEN + 1];    /* current working directory */
-    char       file[MAXPATHLEN + 1];   /* file name buffer */
-    char       shell[MAXPATHLEN + 1];  /* shell response buffer */
+    char       *attach = NMH_ATTACH_HEADER;/* attachment header field name */
+    char       cwd[PATH_MAX + 1];      /* current working directory */
+    char       file[PATH_MAX + 1];     /* file name buffer */
+    char       shell[PATH_MAX + 1];    /* shell response buffer */

     FILE       *f;                     /* read pointer for bgnd proc */
     char       *l;                     /* set on -l to alist  command */
     int                n;                      /* set on -n to alist command */
     FILE       *f;                     /* read pointer for bgnd proc */
     char       *l;                     /* set on -l to alist  command */
     int                n;                      /* set on -n to alist command */


@@ -174,10 +162,10 @@ WhatNow (int argc, char **argv)
            case HELPSW:
                snprintf (buf, sizeof(buf), "%s [switches] [file]", invo_name);
                print_help (buf, whatnowswitches, 1);
            case HELPSW:
                snprintf (buf, sizeof(buf), "%s [switches] [file]", invo_name);
                print_help (buf, whatnowswitches, 1);

-               done (1);
+               done (0);

            case VERSIONSW:
                print_version(invo_name);
            case VERSIONSW:
                print_version(invo_name);

-               done (1);
+               done (0);

 
            case DFOLDSW:
                if (dfolder)
 
            case DFOLDSW:
                if (dfolder)


@@ -213,11 +201,13 @@ WhatNow (int argc, char **argv)
                continue;
 
            case ATTACHSW:
                continue;
 
            case ATTACHSW:

-               if (attach != (char *)0)
-                   adios(NULL, "only one attachment header field name at a time!");

                if (!(attach = *argp++) || *attach == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
                continue;
                if (!(attach = *argp++) || *attach == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
                continue;

+
+           case NOATTACHSW:
+               attach = NULL;
+               continue;

            }
        }
        if (drft)
            }
        }
        if (drft)


@@ -231,6 +221,9 @@ WhatNow (int argc, char **argv)
 
     msgnam = (cp = getenv ("mhaltmsg")) && *cp ? getcpy (cp) : NULL;
 
 
     msgnam = (cp = getenv ("mhaltmsg")) && *cp ? getcpy (cp) : NULL;
 

+    if ((cp = getenv ("mhatfile")) && *cp)
+       atfile = atoi(cp);
+

     if ((cp = getenv ("mhuse")) && *cp)
        use = atoi (cp);
 
     if ((cp = getenv ("mhuse")) && *cp)
        use = atoi (cp);
 


@@ -240,12 +233,17 @@ WhatNow (int argc, char **argv)
     }
 
     /* start editing the draft, unless -noedit was given */
     }
 
     /* start editing the draft, unless -noedit was given */

-    if (!nedit && editfile (&ed, NULL, drft, use, NULL, msgnam, NULL, 1) < 0)
+    if (!nedit && editfile (&ed, NULL, drft, use, NULL, msgnam,
+                           NULL, 1, atfile) < 0)

        done (1);
 
     snprintf (prompt, sizeof(prompt), myprompt, invo_name);
     for (;;) {
        done (1);
 
     snprintf (prompt, sizeof(prompt), myprompt, invo_name);
     for (;;) {

+#ifdef READLINE_SUPPORT
+       if (!(argp = getans_via_readline (prompt, aleqs))) {
+#else /* ! READLINE_SUPPORT */

        if (!(argp = getans (prompt, aleqs))) {
        if (!(argp = getans (prompt, aleqs))) {

+#endif /* READLINE_SUPPORT */

            unlink (LINK);
            done (1);
        }
            unlink (LINK);
            done (1);
        }


@@ -267,7 +265,8 @@ WhatNow (int argc, char **argv)
            /* Call an editor on the draft file */
            if (*++argp)
                ed = *argp++;
            /* Call an editor on the draft file */
            if (*++argp)
                ed = *argp++;

-           if (editfile (&ed, argp, drft, NOUSE, NULL, msgnam, NULL, 1) == NOTOK)
+           if (editfile (&ed, argp, drft, NOUSE, NULL, msgnam,
+                         NULL, 1, atfile) == NOTOK)

                done (1);
            break;
 
                done (1);
            break;
 


@@ -323,7 +322,7 @@ WhatNow (int argc, char **argv)
             */
 
            if (*(argp+1) == (char *)0) {
             */
 
            if (*(argp+1) == (char *)0) {

-               (void)sprintf(buf, "$SHELL -c \"cd;pwd\"");
+               (void)sprintf(buf, "$SHELL -c \"cd&&pwd\"");

            }
            else {
                writesomecmd(buf, BUFSIZ, "cd", "pwd", argp);
            }
            else {
                writesomecmd(buf, BUFSIZ, "cd", "pwd", argp);


@@ -353,7 +352,7 @@ WhatNow (int argc, char **argv)
             *  Use the user's shell so that we can take advantage of any
             *  syntax that the user is accustomed to.
             */
             *  Use the user's shell so that we can take advantage of any
             *  syntax that the user is accustomed to.
             */

-           writelscmd(buf, sizeof(buf), argp);
+           writelscmd(buf, sizeof(buf), "", argp);

            (void)system_in_dir(cwd, buf);
            break;
 
            (void)system_in_dir(cwd, buf);
            break;
 


@@ -418,7 +417,7 @@ WhatNow (int argc, char **argv)
             *  Build a command line that causes the user's shell to list the file name
             *  arguments.  This handles and wildcard expansion, tilde expansion, etc.
             */
             *  Build a command line that causes the user's shell to list the file name
             *  arguments.  This handles and wildcard expansion, tilde expansion, etc.
             */

-           writelscmd(buf, sizeof(buf), argp);
+           writelscmd(buf, sizeof(buf), "-d", argp);

 
            /*
             *  Read back the response from the shell, which contains a number of lines
 
            /*
             *  Read back the response from the shell, which contains a number of lines


@@ -507,7 +506,7 @@ WhatNow (int argc, char **argv)
             * We feed all the file names to the shell at once, otherwise you can't
             * provide a file name with a space in it.
             */
             * We feed all the file names to the shell at once, otherwise you can't
             * provide a file name with a space in it.
             */

-           writelscmd(buf, sizeof(buf), argp);
+           writelscmd(buf, sizeof(buf), "-d", argp);

            if ((f = popen_in_dir(cwd, buf, "r")) != (FILE *)0) {
                while (fgets(shell, sizeof (shell), f) != (char *)0) {
                    *(strchr(shell, '\n')) = '\0';
            if ((f = popen_in_dir(cwd, buf, "r")) != (FILE *)0) {
                while (fgets(shell, sizeof (shell), f) != (char *)0) {
                    *(strchr(shell, '\n')) = '\0';


@@ -548,9 +547,9 @@ writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp)
      * new C99 mandated 'number of chars that would have been written'
      */
     /* length checks here and inside the loop allow for the
      * new C99 mandated 'number of chars that would have been written'
      */
     /* length checks here and inside the loop allow for the

-     * trailing ';', trailcmd, '"' and NUL
+     * trailing "&&", trailcmd, '"' and NUL

      */
      */

-    int trailln = strlen(trailcmd) + 3;
+    int trailln = strlen(trailcmd) + 4;

     if (ln < 0 || ln + trailln > bufsz)
        adios((char *)0, "arguments too long");
     
     if (ln < 0 || ln + trailln > bufsz)
        adios((char *)0, "arguments too long");
     


@@ -566,9 +565,9 @@ writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp)
        cp += ln;
     }
     if (*trailcmd) {
        cp += ln;
     }
     if (*trailcmd) {

-       *cp++ = ';';
+       *cp++ = '&'; *cp++ = '&';

        strcpy(cp, trailcmd);
        strcpy(cp, trailcmd);

-       cp += trailln - 3;
+       cp += trailln - 4;

     }
     *cp++ = '"';
     *cp = 0;
     }
     *cp++ = '"';
     *cp = 0;


@@ -579,9 +578,11 @@ writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp)
  * arguments.  This handles and wildcard expansion, tilde expansion, etc.
  */
 static void
  * arguments.  This handles and wildcard expansion, tilde expansion, etc.
  */
 static void

-writelscmd(char *buf, int bufsz, char **argp)
+writelscmd(char *buf, int bufsz, char *lsoptions, char **argp)

 {
 {

-    writesomecmd(buf, bufsz, "ls", "", argp);
+  char *lscmd = concat ("ls ", lsoptions, " --", NULL);
+  writesomecmd(buf, bufsz, lscmd, "", argp);
+  free (lscmd);

 }
 
 /* Like system(), but run the command in directory dir.
 }
 
 /* Like system(), but run the command in directory dir.


@@ -592,6 +593,11 @@ system_in_dir(const char *dir, const char *cmd)
 {
     char olddir[BUFSIZ];
     int r;
 {
     char olddir[BUFSIZ];
     int r;

+
+    /* ensure that $SHELL exists, as the cmd was written relying on
+       a non-blank $SHELL... */
+    setenv("SHELL","/bin/sh",0); /* don't overwrite */
+

     if (getcwd(olddir, sizeof(olddir)) == 0)
        adios("getcwd", "could not get working directory");
     if (chdir(dir) != 0)
     if (getcwd(olddir, sizeof(olddir)) == 0)
        adios("getcwd", "could not get working directory");
     if (chdir(dir) != 0)


@@ -608,6 +614,11 @@ popen_in_dir(const char *dir, const char *cmd, const char *type)
 {
     char olddir[BUFSIZ];
     FILE *f;
 {
     char olddir[BUFSIZ];
     FILE *f;

+
+    /* ensure that $SHELL exists, as the cmd was written relying on
+       a non-blank $SHELL... */
+    setenv("SHELL","/bin/sh",0); /* don't overwrite */
+    

     if (getcwd(olddir, sizeof(olddir)) == 0)
        adios("getcwd", "could not get working directory");
     if (chdir(dir) != 0)
     if (getcwd(olddir, sizeof(olddir)) == 0)
        adios("getcwd", "could not get working directory");
     if (chdir(dir) != 0)


@@ -629,7 +640,7 @@ static char *edsave = NULL; /* the editor we used previously */
 
 static int
 editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
 
 static int
 editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,

-         char *altmsg, char *cwd, int save_editor)
+         char *altmsg, char *cwd, int save_editor, int atfile)

 {
     int pid, status, vecp;
     char altpath[BUFSIZ], linkpath[BUFSIZ];
 {
     int pid, status, vecp;
     char altpath[BUFSIZ], linkpath[BUFSIZ];


@@ -638,9 +649,6 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
 
 #ifdef HAVE_LSTAT
     int        slinked = 0;
 
 #ifdef HAVE_LSTAT
     int        slinked = 0;

-#if 0
-    int oumask;        /* PJS: for setting permissions on symlinks. */
-#endif

 #endif /* HAVE_LSTAT */
 
     /* Was there a previous edit session? */
 #endif /* HAVE_LSTAT */
 
     /* Was there a previous edit session? */


@@ -657,8 +665,8 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
        }
     } else {
        /* set initial editor */
        }
     } else {
        /* set initial editor */

-       if (*ed == NULL && (*ed = context_find ("editor")) == NULL)
-           *ed = defaulteditor;
+       if (*ed == NULL)
+           *ed = get_default_editor();

     }
 
     if (altmsg) {
     }
 
     if (altmsg) {


@@ -670,33 +678,26 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
            strncpy (linkpath, LINK, sizeof(linkpath));
        else
            snprintf (linkpath, sizeof(linkpath), "%s/%s", cwd, LINK);
            strncpy (linkpath, LINK, sizeof(linkpath));
        else
            snprintf (linkpath, sizeof(linkpath), "%s/%s", cwd, LINK);

-    }

 
 

-    if (altmsg) {
-       unlink (linkpath);
+       if (atfile) {
+           unlink (linkpath);

 #ifdef HAVE_LSTAT
 #ifdef HAVE_LSTAT

-       if (link (altpath, linkpath) == NOTOK) {
-#if 0
-           /* I don't think permission on symlinks matters /JLR */
-           oumask = umask(0044);       /* PJS: else symlinks are world 'r' */
-#endif
-           symlink (altpath, linkpath);
-#if 0
-           umask(oumask);              /* PJS: else symlinks are world 'r' */
-#endif
-           slinked = 1;
-       } else {
-           slinked = 0;
-       }
+           if (link (altpath, linkpath) == NOTOK) {
+               symlink (altpath, linkpath);
+               slinked = 1;
+           } else {
+               slinked = 0;
+           }

 #else /* not HAVE_LSTAT */
 #else /* not HAVE_LSTAT */

-       link (altpath, linkpath);
+           link (altpath, linkpath);

 #endif /* not HAVE_LSTAT */
 #endif /* not HAVE_LSTAT */

+       }

     }
 
     context_save ();   /* save the context file */
     fflush (stdout);
 
     }
 
     context_save ();   /* save the context file */
     fflush (stdout);
 

-    switch (pid = vfork ()) {
+    switch (pid = vfork()) {

        case NOTOK:
            advise ("fork", "unable to");
            status = NOTOK;
        case NOTOK:
            advise ("fork", "unable to");
            status = NOTOK;


@@ -726,13 +727,6 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
 
        default:
            if ((status = pidwait (pid, NOTOK))) {
 
        default:
            if ((status = pidwait (pid, NOTOK))) {

-#ifdef ATTVIBUG
-               if ((cp = r1bindex (*ed, '/'))
-                       && strcmp (cp, "vi") == 0
-                       && (status & 0x00ff) == 0)
-                   status = 0;
-               else {
-#endif

                if (((status & 0xff00) != 0xff00)
                    && (!reedit || (status & 0x00ff))) {
                    if (!use && (status & 0xff00) &&
                if (((status & 0xff00) != 0xff00)
                    && (!reedit || (status & 0x00ff))) {
                    if (!use && (status & 0xff00) &&


@@ -744,9 +738,6 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
                }
                status = -2;    /* maybe "reedit ? -2 : -1"? */
                break;
                }
                status = -2;    /* maybe "reedit ? -2 : -1"? */
                break;

-#ifdef ATTVIBUG
-               }
-#endif

            }
 
            reedit++;
            }
 
            reedit++;


@@ -780,7 +771,7 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
        edsave = getcpy (*ed);
 
     *ed = NULL;
        edsave = getcpy (*ed);
 
     *ed = NULL;

-    if (altmsg)
+    if (altmsg && atfile)

        unlink (linkpath);
 
     return status;
        unlink (linkpath);
 
     return status;


@@ -830,16 +821,14 @@ sendfile (char **arg, char *file, int pushsw)
     /* Translate MIME composition file, if necessary */
     if ((cp = context_find ("automimeproc"))
            && (!strcmp (cp, "1"))
     /* Translate MIME composition file, if necessary */
     if ((cp = context_find ("automimeproc"))
            && (!strcmp (cp, "1"))

-           && !getenv ("NOMHNPROC")

            && check_draft (file)
            && (buildfile (NULL, file) == NOTOK))
        return 0;
 
     /* For backwards compatibility */
     if ((cp = context_find ("automhnproc"))
            && check_draft (file)
            && (buildfile (NULL, file) == NOTOK))
        return 0;
 
     /* For backwards compatibility */
     if ((cp = context_find ("automhnproc"))

-           && !getenv ("NOMHNPROC")

            && check_draft (file)
            && check_draft (file)

-           && (i = editfile (&cp, NULL, file, NOUSE, NULL, NULL, NULL, 0)))
+           && (i = editfile (&cp, NULL, file, NOUSE, NULL, NULL, NULL, 0, 0)))

        return 0;
 
     /*
        return 0;
 
     /*


@@ -918,7 +907,7 @@ buildfile (char **argp, char *file)
        args[i++] = *argp++;
     args[i] = NULL;
 
        args[i++] = *argp++;
     args[i] = NULL;
 

-    i = editfile (&ed, args, file, NOUSE, NULL, NULL, NULL, 0);
+    i = editfile (&ed, args, file, NOUSE, NULL, NULL, NULL, 0, 0);

     free (args);
 
     return (i ? NOTOK : OK);
     free (args);
 
     return (i ? NOTOK : OK);


@@ -989,95 +978,64 @@ check_draft (char *msgnam)
 # define TLSminc(a)   0
 #endif /* TLS_SUPPORT */
 
 # define TLSminc(a)   0
 #endif /* TLS_SUPPORT */
 

-static struct swit  sendswitches[] = {
-#define        ALIASW            0
-    { "alias aliasfile", 0 },
-#define        DEBUGSW           1
-    { "debug", -5 },
-#define        FILTSW            2
-    { "filter filterfile", 0 },
-#define        NFILTSW           3
-    { "nofilter", 0 },
-#define        FRMTSW            4
-    { "format", 0 },
-#define        NFRMTSW           5
-    { "noformat", 0 },
-#define        FORWSW            6
-    { "forward", 0 },
-#define        NFORWSW           7
-    { "noforward", 0 },
-#define MIMESW            8
-    { "mime", 0 },
-#define NMIMESW           9
-    { "nomime", 0 },
-#define MSGDSW           10
-    { "msgid", 0 },
-#define NMSGDSW          11
-    { "nomsgid", 0 },
-#define SPSHSW           12
-    { "push", 0 },
-#define NSPSHSW          13
-    { "nopush", 0 },
-#define SPLITSW          14
-    { "split seconds", 0 },
-#define UNIQSW           15
-    { "unique", -6 },
-#define NUNIQSW          16
-    { "nounique", -8 },
-#define VERBSW           17
-    { "verbose", 0 },
-#define NVERBSW          18
-    { "noverbose", 0 },
-#define        WATCSW           19
-    { "watch", 0 },
-#define        NWATCSW          20
-    { "nowatch", 0 },
-#define        WIDTHSW          21
-    { "width columns", 0 },
-#define SVERSIONSW       22
-    { "version", 0 },
-#define        SHELPSW          23
-    { "help", 0 },
-#define BITSTUFFSW       24
-    { "dashstuffing", -12 },
-#define NBITSTUFFSW      25
-    { "nodashstuffing", -14 },
-#define        MAILSW           26
-    { "mail", -4 },
-#define        SAMLSW           27
-    { "saml", -4 },
-#define        SSNDSW           28
-    { "send", -4 },
-#define        SOMLSW           29
-    { "soml", -4 },
-#define        CLIESW           30
-    { "client host", -6 },
-#define        SERVSW           31
-    { "server host", 6 },
-#define        SNOOPSW          32
-    { "snoop", -5 },
-#define SDRFSW           33
-    { "draftfolder +folder", -6 },
-#define SDRMSW           34
-    { "draftmessage msg", -6 },
-#define SNDRFSW          35
-    { "nodraftfolder", -3 },
-#define SASLSW           36
-    { "sasl", SASLminc(-4) },
-#define SASLMECHSW       37
-    { "saslmech", SASLminc(-5) },
-#define USERSW           38
-    { "user", SASLminc(-4) },
-#define SNDATTACHSW       39
-    { "attach file", 6 },
-#define SNDATTACHFORMAT   40
-    { "attachformat", 7 },
-#define PORTSW           41
-    { "port server-port-name/number", 4 },
-#define TLSSW            42
-    { "tls", TLSminc(-3) },
-    { NULL, 0 }
-};
+#define SEND_SWITCHES \
+    X("alias aliasfile", 0, ALIASW) \
+    X("debug", -5, DEBUGSW) \
+    X("filter filterfile", 0, FILTSW) \
+    X("nofilter", 0, NFILTSW) \
+    X("format", 0, FRMTSW) \
+    X("noformat", 0, NFRMTSW) \
+    X("forward", 0, FORWSW) \
+    X("noforward", 0, NFORWSW) \
+    X("mime", 0, MIMESW) \
+    X("nomime", 0, NMIMESW) \
+    X("msgid", 0, MSGDSW) \
+    X("nomsgid", 0, NMSGDSW) \
+    X("push", 0, SPSHSW) \
+    X("nopush", 0, NSPSHSW) \
+    X("split seconds", 0, SPLITSW) \
+    X("unique", -6, UNIQSW) \
+    X("nounique", -8, NUNIQSW) \
+    X("verbose", 0, VERBSW) \
+    X("noverbose", 0, NVERBSW) \
+    X("watch", 0, WATCSW) \
+    X("nowatch", 0, NWATCSW) \
+    X("width columns", 0, WIDTHSW) \
+    X("version", 0, SVERSIONSW) \
+    X("help", 0, SHELPSW) \
+    X("dashstuffing", -12, BITSTUFFSW) \
+    X("nodashstuffing", -14, NBITSTUFFSW) \
+    X("mail", -4, MAILSW) \
+    X("saml", -4, SAMLSW) \
+    X("send", -4, SSNDSW) \
+    X("soml", -4, SOMLSW) \
+    X("client host", -6, CLIESW) \
+    X("server host", 6, SERVSW) \
+    X("snoop", -5, SNOOPSW) \
+    X("draftfolder +folder", -6, SDRFSW) \
+    X("draftmessage msg", -6, SDRMSW) \
+    X("nodraftfolder", -3, SNDRFSW) \
+    X("sasl", SASLminc(-4), SASLSW) \
+    X("nosasl", SASLminc(-6), NOSASLSW) \
+    X("saslmaxssf", SASLminc(-10), SASLMXSSFSW) \
+    X("saslmech", SASLminc(-5), SASLMECHSW) \
+    X("user", SASLminc(-4), USERSW) \
+    X("attach file", 6, SNDATTACHSW) \
+    X("noattach", 0, SNDNOATTACHSW) \
+    X("attachformat", 7, SNDATTACHFORMAT) \
+    X("port server-port-name/number", 4, PORTSW) \
+    X("tls", TLSminc(-3), TLSSW) \
+    X("notls", TLSminc(-5), NTLSSW) \
+    X("mts smtp|sendmail/smtp|sendmail/pipe", 2, MTSSW) \
+    X("messageid localname|random", 2, MESSAGEIDSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(SEND);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(SEND, sendswitches);
+#undef X

 
 
 extern int debugsw;            /* from sendsbr.c */
 
 
 extern int debugsw;            /* from sendsbr.c */


@@ -1100,16 +1058,13 @@ sendit (char *sp, char **arg, char *file, int pushed)
     char *cp, buf[BUFSIZ], **argp;
     char **arguments, *vec[MAXARGS];
     struct stat st;
     char *cp, buf[BUFSIZ], **argp;
     char **arguments, *vec[MAXARGS];
     struct stat st;

-    char       *attach = (char *)0;    /* attachment header field name */
-    int                attachformat = 0;       /* mhbuild format specifier for
+    char       *attach = NMH_ATTACH_HEADER;/* attachment header field name */
+    int                attachformat = 1;       /* mhbuild format specifier for

                                           attachments */
 
 #ifndef        lint
     int        distsw = 0;
 #endif
                                           attachments */
 
 #ifndef        lint
     int        distsw = 0;
 #endif

-#ifdef UCI
-    FILE *fp;
-#endif

 
     /*
      * Make sure these are defined.  In particular, we need
 
     /*
      * Make sure these are defined.  In particular, we need


@@ -1240,7 +1195,9 @@ sendit (char *sp, char **arg, char *file, int pushed)
                case SOMLSW:
                case SNOOPSW:
                case SASLSW:
                case SOMLSW:
                case SNOOPSW:
                case SASLSW:

+               case NOSASLSW:

                case TLSSW:
                case TLSSW:

+               case NTLSSW:

                    vec[vecp++] = --cp;
                    continue;
 
                    vec[vecp++] = --cp;
                    continue;
 


@@ -1249,9 +1206,12 @@ sendit (char *sp, char **arg, char *file, int pushed)
                case WIDTHSW:
                case CLIESW:
                case SERVSW:
                case WIDTHSW:
                case CLIESW:
                case SERVSW:

+               case SASLMXSSFSW:

                case SASLMECHSW:
                case USERSW:
                case PORTSW:
                case SASLMECHSW:
                case USERSW:
                case PORTSW:

+               case MTSSW:
+               case MESSAGEIDSW:

                    vec[vecp++] = --cp;
                    if (!(cp = *argp++) || *cp == '-') {
                        advise (NULL, "missing argument to %s", argp[-2]);
                    vec[vecp++] = --cp;
                    if (!(cp = *argp++) || *cp == '-') {
                        advise (NULL, "missing argument to %s", argp[-2]);


@@ -1275,6 +1235,9 @@ sendit (char *sp, char **arg, char *file, int pushed)
                        return;
                    }
                    continue;
                        return;
                    }
                    continue;

+               case SNDNOATTACHSW:
+                   attach = NULL;
+                   continue;

 
                case SNDATTACHFORMAT:
                    if (! *argp || **argp == '-')
 
                case SNDATTACHFORMAT:
                    if (! *argp || **argp == '-')


@@ -1310,18 +1273,6 @@ sendit (char *sp, char **arg, char *file, int pushed)
     if ((cp = getenv ("SIGNATURE")) == NULL || *cp == 0)
        if ((cp = context_find ("signature")) && *cp)
            m_putenv ("SIGNATURE", cp);
     if ((cp = getenv ("SIGNATURE")) == NULL || *cp == 0)
        if ((cp = context_find ("signature")) && *cp)
            m_putenv ("SIGNATURE", cp);

-#ifdef UCI
-       else {
-           snprintf (buf, sizeof(buf), "%s/.signature", mypath);
-           if ((fp = fopen (buf, "r")) != NULL
-               && fgets (buf, sizeof(buf), fp) != NULL) {
-                   fclose (fp);
-                   if (cp = strchr (buf, '\n'))
-                       *cp = 0;
-                   m_putenv ("SIGNATURE", buf);
-           }
-       }
-#endif /* UCI */

 
     if ((annotext = getenv ("mhannotate")) == NULL || *annotext == 0)
        annotext = NULL;
 
     if ((annotext = getenv ("mhannotate")) == NULL || *annotext == 0)
        annotext = NULL;


@@ -1338,6 +1289,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
            && altmsg) {
        vec[vecp++] = "-dist";
        distfile = getcpy (m_mktemp2(altmsg, invo_name, NULL, NULL));
            && altmsg) {
        vec[vecp++] = "-dist";
        distfile = getcpy (m_mktemp2(altmsg, invo_name, NULL, NULL));

+       unlink(distfile);

        if (link (altmsg, distfile) == NOTOK)
            adios (distfile, "unable to link %s to", altmsg);
     } else {
        if (link (altmsg, distfile) == NOTOK)
            adios (distfile, "unable to link %s to", altmsg);
     } else {


@@ -1373,7 +1325,7 @@ whomfile (char **arg, char *file)
     context_save ();   /* save the context file */
     fflush (stdout);
 
     context_save ();   /* save the context file */
     fflush (stdout);
 

-    switch (pid = vfork ()) {
+    switch (pid = vfork()) {

        case NOTOK:
            advise ("fork", "unable to");
            return 1;
        case NOTOK:
            advise ("fork", "unable to");
            return 1;