Support iCalendar event request files that don't end with a newline.

[nmh] / uip / whatnowsbr.c

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 6149c125f57d379e8f8f03e421068b459d8645a8..71daf43f3153f5ad54302bd71f9d381ebe57486d 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -1,6 +1,4 @@
-
-/*
- * whatnowsbr.c -- the WhatNow shell
+/* whatnowsbr.c -- the WhatNow shell

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -44,6 +42,10 @@
 #include <h/mime.h>
 #include <h/utils.h>
 
 #include <h/mime.h>
 #include <h/utils.h>
 

+#ifdef OAUTH_SUPPORT
+# include <h/oauth.h>
+#endif
+

 #define WHATNOW_SWITCHES \
     X("draftfolder +folder", 0, DFOLDSW) \
     X("draftmessage msg", 0, DMSGSW) \
 #define WHATNOW_SWITCHES \
     X("draftfolder +folder", 0, DFOLDSW) \
     X("draftmessage msg", 0, DMSGSW) \


@@ -53,8 +55,6 @@
     X("prompt string", 4, PRMPTSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
     X("prompt string", 4, PRMPTSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \

-    X("attach header-field-name", -6, ATTACHSW) \
-    X("noattach", -8, NOATTACHSW) \

 
 
 #define X(sw, minchars, id) id,
 
 
 #define X(sw, minchars, id) id,


@@ -104,9 +104,9 @@ static int editfile (char **, char **, char *, int, struct msgs *,
 static int sendfile (char **, char *, int);
 static void sendit (char *, char **, char *, int);
 static int buildfile (char **, 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 int whomfile (char **, char *);
 static int removefile (char *);

+static int checkmimeheader (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 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);


@@ -130,11 +130,9 @@ WhatNow (int argc, char **argv)
     char       *l;                     /* set on -l to alist  command */
     int                n;                      /* set on -n to alist command */
 
     char       *l;                     /* set on -l to alist  command */
     int                n;                      /* set on -n to alist command */
 

+    /* Need this if called from what_now(). */

     invo_name = r1bindex (argv[0], '/');
 
     invo_name = r1bindex (argv[0], '/');
 

-    /* read user profile/context */
-    context_read();
-

     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 


@@ -142,7 +140,7 @@ WhatNow (int argc, char **argv)
      * Get the initial current working directory.
      */
 
      * Get the initial current working directory.
      */
 

-    if (getcwd(cwd, sizeof (cwd)) == (char *)0) {
+    if (getcwd(cwd, sizeof (cwd)) == NULL) {

        adios("getcwd", "could not get working directory");
     }
 
        adios("getcwd", "could not get working directory");
     }
 


@@ -195,14 +193,6 @@ WhatNow (int argc, char **argv)
                if (!(myprompt = *argp++) || *myprompt == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
                continue;
                if (!(myprompt = *argp++) || *myprompt == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
                continue;

-
-           case ATTACHSW:
-               advise(NULL, "The -attach switch is deprecated");
-               continue;
-
-           case NOATTACHSW:
-               advise(NULL, "The -noattach switch is deprecated");
-               continue;

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


@@ -214,7 +204,7 @@ WhatNow (int argc, char **argv)
     if ((drft == NULL && (drft = getenv ("mhdraft")) == NULL) || *drft == 0)
        drft = getcpy (m_draft (dfolder, dmsg, 1, &isdf));
 
     if ((drft == NULL && (drft = getenv ("mhdraft")) == NULL) || *drft == 0)
        drft = getcpy (m_draft (dfolder, dmsg, 1, &isdf));
 

-    msgnam = (cp = getenv ("mhaltmsg")) && *cp ? getcpy (cp) : NULL;
+    msgnam = (cp = getenv ("mhaltmsg")) && *cp ? mh_xstrdup(cp) : NULL;

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


@@ -235,11 +225,11 @@ WhatNow (int argc, char **argv)
     snprintf (prompt, sizeof(prompt), myprompt, invo_name);
     for (;;) {
 #ifdef READLINE_SUPPORT
     snprintf (prompt, sizeof(prompt), myprompt, invo_name);
     for (;;) {
 #ifdef READLINE_SUPPORT

-       if (!(argp = getans_via_readline (prompt, aleqs))) {
+       if (!(argp = read_switch_multiword_via_readline (prompt, aleqs))) {

 #else /* ! READLINE_SUPPORT */
 #else /* ! READLINE_SUPPORT */

-       if (!(argp = getans (prompt, aleqs))) {
+       if (!(argp = read_switch_multiword (prompt, aleqs))) {

 #endif /* READLINE_SUPPORT */
 #endif /* READLINE_SUPPORT */

-           unlink (LINK);
+           (void) m_unlink (LINK);

            done (1);
        }
        switch (smatch (*argp, aleqs)) {
            done (1);
        }
        switch (smatch (*argp, aleqs)) {


@@ -248,7 +238,7 @@ WhatNow (int argc, char **argv)
            if (msgnam)
                showfile (++argp, msgnam);
            else
            if (msgnam)
                showfile (++argp, msgnam);
            else

-               advise (NULL, "no alternate message to display");
+               inform("no alternate message to display");

            break;
 
        case BUILDMIMESW:
            break;
 
        case BUILDMIMESW:


@@ -282,7 +272,7 @@ WhatNow (int argc, char **argv)
                removefile (drft);
            } else {
                if (stat (drft, &st) != NOTOK)
                removefile (drft);
            } else {
                if (stat (drft, &st) != NOTOK)

-                   advise (NULL, "draft left on %s", drft);
+                   inform("draft left on %s", drft);

            }
            done (1);
 
            }
            done (1);
 


@@ -316,18 +306,17 @@ WhatNow (int argc, char **argv)
             *  is accustomed to.  Read back the absolute path.
             */
 
             *  is accustomed to.  Read back the absolute path.
             */
 

-           if (*(argp+1) == (char *)0) {
-               (void)sprintf(buf, "$SHELL -c \"cd&&pwd\"");
+           if (*(argp+1) == NULL) {
+               strcpy(buf, "$SHELL -c \"cd&&pwd\"");

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

-           if ((f = popen_in_dir(cwd, buf, "r")) != (FILE *)0) {
-               fgets(cwd, sizeof (cwd), f);
-
-               if (strchr(cwd, '\n') != (char *)0)
-                       *strchr(cwd, '\n') = '\0';
-
+           if ((f = popen_in_dir(cwd, buf, "r")) != NULL) {
+               if (fgets(cwd, sizeof (cwd), f) == NULL) {
+                   advise (buf, "fgets");
+               }
+                trim_suffix_c(cwd, '\n');

                pclose(f);
            }
            else {
                pclose(f);
            }
            else {


@@ -338,7 +327,7 @@ WhatNow (int argc, char **argv)
 
        case PWDCMDSW:
            /* Print the working directory for attachments */
 
        case PWDCMDSW:
            /* Print the working directory for attachments */

-           printf("%s\n", cwd);
+           puts(cwd);

            break;
 
        case LSCMDSW:
            break;
 
        case LSCMDSW:


@@ -359,10 +348,13 @@ WhatNow (int argc, char **argv)
             *   -n     numbers listing
             */
 
             *   -n     numbers listing
             */
 

-           l = (char *)0;
+           if (checkmimeheader(drft))
+               break;
+
+           l = NULL;

            n = 0;
 
            n = 0;
 

-           while (*++argp != (char *)0) {
+           while (*++argp != NULL) {

                if (strcmp(*argp, "-l") == 0)
                    l = "/";
 
                if (strcmp(*argp, "-l") == 0)
                    l = "/";
 


@@ -381,7 +373,7 @@ WhatNow (int argc, char **argv)
            }
 
            if (n == -1)
            }
 
            if (n == -1)

-               advise((char *)0, "usage is alist [-ln].");
+               inform("usage is alist [-ln].");

 
            else
                annolist(drft, ATTACH_FIELD, l, n);
 
            else
                annolist(drft, ATTACH_FIELD, l, n);


@@ -396,6 +388,9 @@ WhatNow (int argc, char **argv)
             int verbose = 0;
             char **ap;
 
             int verbose = 0;
             char **ap;
 

+           if (checkmimeheader(drft))
+               break;
+

            for (ap = argp+1; *ap; ++ap) {
                if (strcmp(*ap, "-v") == 0) {
                    ++argp;
            for (ap = argp+1; *ap; ++ap) {
                if (strcmp(*ap, "-v") == 0) {
                    ++argp;


@@ -405,8 +400,8 @@ WhatNow (int argc, char **argv)
                }
            }
 
                }
            }
 

-           if (*(argp+1) == (char *)0) {
-               advise(NULL, "attach command requires file argument(s).");
+           if (*(argp+1) == NULL) {
+               inform("attach command requires file argument(s).");

                break;
            }
 
                break;
            }
 


@@ -424,11 +419,11 @@ WhatNow (int argc, char **argv)
             *  draft.
             */
 
             *  draft.
             */
 

-           if ((f = popen_in_dir(cwd, buf, "r")) != (FILE *)0) {
-               while (fgets(shell, sizeof (shell), f) != (char *)0) {
+           if ((f = popen_in_dir(cwd, buf, "r")) != NULL) {
+               while (fgets(shell, sizeof (shell), f) != NULL) {

                    char *ctype;
 
                    char *ctype;
 

-                   *(strchr(shell, '\n')) = '\0';
+                    trim_suffix_c(shell, '\n');

 
                    if (*shell == '/') {
                        strncpy(file, shell, sizeof(file));
 
                    if (*shell == '/') {
                        strncpy(file, shell, sizeof(file));


@@ -440,10 +435,7 @@ WhatNow (int argc, char **argv)
                    annotate(drft, ATTACH_FIELD, file, 1, 0, -2, 1);
                    if (verbose) {
                        ctype = mime_type(file);
                    annotate(drft, ATTACH_FIELD, file, 1, 0, -2, 1);
                    if (verbose) {
                        ctype = mime_type(file);

-                   }
-
-                   if (verbose) {
-                       printf ("Attaching %s as a %s", file, ctype);
+                       printf ("Attaching %s as a %s\n", file, ctype);

                        free (ctype);
                    }
                }
                        free (ctype);
                    }
                }


@@ -466,7 +458,10 @@ WhatNow (int argc, char **argv)
             *  so this catches a -n anywhere in the argument list.
             */
 
             *  so this catches a -n anywhere in the argument list.
             */
 

-           for (n = 0, arguments = argp + 1; *arguments != (char *)0; arguments++) {
+           if (checkmimeheader(drft))
+               break;
+
+           for (n = 0, arguments = argp + 1; *arguments != NULL; arguments++) {

                if (strcmp(*arguments, "-n") == 0) {
                        n = 1;
                        break;
                if (strcmp(*arguments, "-n") == 0) {
                        n = 1;
                        break;


@@ -481,15 +476,15 @@ WhatNow (int argc, char **argv)
             */
 
            if (n == 1) {
             */
 
            if (n == 1) {

-               for (arguments = argp + 1; *arguments != (char *)0; arguments++) {
+               for (arguments = argp + 1; *arguments != NULL; arguments++) {

                    if (strcmp(*arguments, "-n") == 0)
                        continue;
 
                    if (**arguments != '\0') {
                        n = atoi(*arguments);
                    if (strcmp(*arguments, "-n") == 0)
                        continue;
 
                    if (**arguments != '\0') {
                        n = atoi(*arguments);

-                       annotate(drft, ATTACH_FIELD, (char *)0, 1, 0, n, 1);
+                       annotate(drft, ATTACH_FIELD, NULL, 1, 0, n, 1);

 
 

-                       for (argp = arguments + 1; *argp != (char *)0; argp++) {
+                       for (argp = arguments + 1; *argp != NULL; argp++) {

                            if (atoi(*argp) > n) {
                                if (atoi(*argp) == 1)
                                    *argp = "";
                            if (atoi(*argp) > n) {
                                if (atoi(*argp) == 1)
                                    *argp = "";


@@ -511,9 +506,9 @@ WhatNow (int argc, char **argv)
             * provide a file name with a space in it.
             */
            writelscmd(buf, sizeof(buf), "-d --", argp);
             * provide a file name with a space in it.
             */
            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")) != NULL) {
+               while (fgets(shell, sizeof (shell), f) != NULL) {
+                    trim_suffix_c(shell, '\n');

                    annotate(drft, ATTACH_FIELD, shell, 1, 0, 0, 1);
                }
                pclose(f);
                    annotate(drft, ATTACH_FIELD, shell, 1, 0, 0, 1);
                }
                pclose(f);


@@ -525,7 +520,7 @@ WhatNow (int argc, char **argv)
 
        default:
            /* Unknown command */
 
        default:
            /* Unknown command */

-           advise (NULL, "say what?");
+           inform("say what?");

            break;
        }
     }
            break;
        }
     }


@@ -555,7 +550,7 @@ writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp)
      */
     int trailln = strlen(trailcmd) + 4;
     if (ln < 0 || ln + trailln > bufsz)
      */
     int trailln = strlen(trailcmd) + 4;
     if (ln < 0 || ln + trailln > bufsz)

-       adios((char *)0, "arguments too long");
+       adios(NULL, "arguments too long");

 
     cp = buf + ln;
 
 
     cp = buf + ln;
 


@@ -563,7 +558,7 @@ writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp)
        ln = strlen(*argp);
        /* +1 for leading space */
        if (ln + trailln + 1 > bufsz - (cp-buf))
        ln = strlen(*argp);
        /* +1 for leading space */
        if (ln + trailln + 1 > bufsz - (cp-buf))

-           adios((char *)0, "arguments too long");
+           adios(NULL, "arguments too long");

        *cp++ = ' ';
        memcpy(cp, *argp, ln+1);
        cp += ln;
        *cp++ = ' ';
        memcpy(cp, *argp, ln+1);
        cp += ln;


@@ -654,7 +649,7 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
     int        slinked = 0;
 
     /* Was there a previous edit session? */
     int        slinked = 0;
 
     /* Was there a previous edit session? */

-    if (reedit) {
+    if (reedit && (*ed || edsave)) {

        if (!*ed) {             /* no explicit editor      */
            *ed = edsave;       /* so use the previous one */
            if ((cp = r1bindex (*ed, '/')) == NULL)
        if (!*ed) {             /* no explicit editor      */
            *ed = edsave;       /* so use the previous one */
            if ((cp = r1bindex (*ed, '/')) == NULL)


@@ -682,9 +677,11 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
            snprintf (linkpath, sizeof(linkpath), "%s/%s", cwd, LINK);
 
        if (atfile) {
            snprintf (linkpath, sizeof(linkpath), "%s/%s", cwd, LINK);
 
        if (atfile) {

-           unlink (linkpath);
+           (void) m_unlink (linkpath);

            if (link (altpath, linkpath) == NOTOK) {
            if (link (altpath, linkpath) == NOTOK) {

-               symlink (altpath, linkpath);
+               if (symlink (altpath, linkpath) < 0) {
+                   adios (linkpath, "symlink");
+               }

                slinked = 1;
            } else {
                slinked = 0;
                slinked = 1;
            } else {
                slinked = 0;


@@ -702,12 +699,15 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
            break;
 
        case OK:
            break;
 
        case OK:

-           if (cwd)
-               chdir (cwd);
+           if (cwd) {
+               if (chdir (cwd) < 0) {
+                   advise (cwd, "chdir");
+               }
+           }

            if (altmsg) {
                if (mp)
            if (altmsg) {
                if (mp)

-                   m_putenv ("mhfolder", mp->foldpath);
-               m_putenv ("editalt", altpath);
+                   setenv("mhfolder", mp->foldpath, 1);
+               setenv("editalt", altpath, 1);

            }
 
            vec = argsplit(*ed, &prog, &vecp);
            }
 
            vec = argsplit(*ed, &prog, &vecp);


@@ -729,9 +729,9 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
                    && (!reedit || (status & 0x00ff))) {
                    if (!use && (status & 0xff00) &&
                            (rename (file, cp = m_backup (file)) != NOTOK)) {
                    && (!reedit || (status & 0x00ff))) {
                    if (!use && (status & 0xff00) &&
                            (rename (file, cp = m_backup (file)) != NOTOK)) {

-                       advise (NULL, "problems with edit--draft left in %s", cp);
+                       inform("problems with edit--draft left in %s", cp);

                    } else {
                    } else {

-                       advise (NULL, "problems with edit--%s preserved", file);
+                       inform("problems with edit--%s preserved", file);

                    }
                }
                status = -2;    /* maybe "reedit ? -2 : -1"? */
                    }
                }
                status = -2;    /* maybe "reedit ? -2 : -1"? */


@@ -748,7 +748,7 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
                                && copyf (linkpath, altpath) == NOTOK
                           : stat (linkpath, &st) != NOTOK
                                && st.st_nlink == 1
                                && copyf (linkpath, altpath) == NOTOK
                           : stat (linkpath, &st) != NOTOK
                                && st.st_nlink == 1

-                               && (unlink (altpath) == NOTOK
+                               && (m_unlink (altpath) == NOTOK

                                        || link (linkpath, altpath) == NOTOK)))
                advise (linkpath, "unable to update %s from", altmsg);
     }
                                        || link (linkpath, altpath) == NOTOK)))
                advise (linkpath, "unable to update %s from", altmsg);
     }


@@ -759,7 +759,7 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
 
     *ed = NULL;
     if (altmsg && atfile)
 
     *ed = NULL;
     if (altmsg && atfile)

-       unlink (linkpath);
+       (void) m_unlink (linkpath);

 
     return status;
 }
 
     return status;
 }


@@ -821,7 +821,8 @@ sendfile (char **arg, char *file, int pushsw)
        sleep (5);
     switch (child_id) {
        case NOTOK:
        sleep (5);
     switch (child_id) {
        case NOTOK:

-           advise (NULL, "unable to fork, so sending directly...");
+           inform("unable to fork, so sending directly...");
+           /* FALLTHRU */

        case OK:
            vec = argsplit(sendproc, &program, &vecp);
            if (pushsw)
        case OK:
            vec = argsplit(sendproc, &program, &vecp);
            if (pushsw)


@@ -885,66 +886,6 @@ buildfile (char **argp, char *file)
 }
 
 
 }
 
 

-/*
- *  Check if draft is a mhbuild composition file
- */
-
-static int
-check_draft (char *msgnam)
-{
-    int        state;
-    char buf[BUFSIZ], name[NAMESZ];
-    FILE *fp;
-    m_getfld_state_t gstate = 0;
-
-    if ((fp = fopen (msgnam, "r")) == NULL)
-       return 0;
-    for (;;) {
-       int bufsz = sizeof buf;
-       switch (state = m_getfld (&gstate, name, buf, &bufsz, fp)) {
-           case FLD:
-           case FLDPLUS:
-               /*
-                * If draft already contains any of the
-                * Content-XXX fields, then assume it already
-                * been converted.
-                */
-               if (uprf (name, XXX_FIELD_PRF)) {
-                   fclose (fp);
-                   m_getfld_state_destroy (&gstate);
-                   return 0;
-               }
-               while (state == FLDPLUS) {
-                   bufsz = sizeof buf;
-                   state = m_getfld (&gstate, name, buf, &bufsz, fp);
-               }
-               break;
-
-           case BODY:
-               do {
-                   char *bp;
-
-                   for (bp = buf; *bp; bp++)
-                       if (*bp != ' ' && *bp != '\t' && *bp != '\n') {
-                           fclose (fp);
-                           m_getfld_state_destroy (&gstate);
-                           return 1;
-                       }
-
-                   bufsz = sizeof buf;
-                   state = m_getfld (&gstate, name, buf, &bufsz, fp);
-               } while (state == BODY);
-               /* and fall... */
-
-           default:
-               fclose (fp);
-               m_getfld_state_destroy (&gstate);
-               return 0;
-       }
-    }
-}
-
-

 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)
 #else /* CYRUS_SASL */
 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)
 #else /* CYRUS_SASL */


@@ -987,21 +928,21 @@ check_draft (char *msgnam)
     X("client host", -6, CLIESW) \
     X("server host", 6, SERVSW) \
     X("snoop", -5, SNOOPSW) \
     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 fieldname", 6, SNDATTACHSW) \
-    X("noattach", 0, SNDNOATTACHSW) \
-    X("attachformat", 7, SNDATTACHFORMAT) \
+    X("draftfolder +folder", 0, SDRFSW) \
+    X("draftmessage msg", 0, SDRMSW) \
+    X("nodraftfolder", 0, SNDRFSW) \
+    X("sasl", SASLminc(4), SASLSW) \
+    X("nosasl", SASLminc(6), NOSASLSW) \
+    X("saslmech", SASLminc(5), SASLMECHSW) \
+    X("authservice", SASLminc(0), AUTHSERVICESW) \
+    X("user username", SASLminc(4), USERSW) \

     X("port server-port-name/number", 4, PORTSW) \
     X("tls", TLSminc(-3), TLSSW) \
     X("initialtls", TLSminc(-10), INITTLSSW) \
     X("notls", TLSminc(-5), NTLSSW) \
     X("port server-port-name/number", 4, PORTSW) \
     X("tls", TLSminc(-3), TLSSW) \
     X("initialtls", TLSminc(-10), INITTLSSW) \
     X("notls", TLSminc(-5), NTLSSW) \

+    X("certverify", TLSminc(-10), CERTVERSW) \
+    X("nocertverify", TLSminc(-12), NOCERTVERSW) \
+    X("sendmail program", 0, MTSSM) \

     X("mts smtp|sendmail/smtp|sendmail/pipe", 2, MTSSW) \
     X("messageid localname|random", 2, MESSAGEIDSW) \
 
     X("mts smtp|sendmail/smtp|sendmail/pipe", 2, MTSSW) \
     X("messageid localname|random", 2, MESSAGEIDSW) \
 


@@ -1033,6 +974,9 @@ sendit (char *sp, char **arg, char *file, int pushed)
     int        vecp, n = 1;
     char *cp, buf[BUFSIZ], **argp, *program;
     char **arguments, *savearg[MAXARGS], **vec;
     int        vecp, n = 1;
     char *cp, buf[BUFSIZ], **argp, *program;
     char **arguments, *savearg[MAXARGS], **vec;

+    const char *user = NULL, *saslmech = NULL;
+    char *auth_svc = NULL;
+    int snoop = 0;

     struct stat st;
 
 #ifndef        lint
     struct stat st;
 
 #ifndef        lint


@@ -1113,7 +1057,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
                    ambigsw (cp, sendswitches);
                    return;
                case UNKWNSW:
                    ambigsw (cp, sendswitches);
                    return;
                case UNKWNSW:

-                   advise (NULL, "-%s unknown\n", cp);
+                   inform("-%s unknown\n", cp);

                    return;
 
                case SHELPSW:
                    return;
 
                case SHELPSW:


@@ -1133,7 +1077,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
 
                case SPLITSW:
                    if (!(cp = *argp++) || sscanf (cp, "%d", &splitsw) != 1) {
 
                case SPLITSW:
                    if (!(cp = *argp++) || sscanf (cp, "%d", &splitsw) != 1) {

-                       advise (NULL, "missing argument to %s", argp[-2]);
+                       inform("missing argument to %s", argp[-2]);

                        return;
                    }
                    continue;
                        return;
                    }
                    continue;


@@ -1161,7 +1105,8 @@ sendit (char *sp, char **arg, char *file, int pushed)
                    continue;
 
                case DEBUGSW:
                    continue;
 
                case DEBUGSW:

-                   debugsw++;  /* fall */
+                   debugsw++;
+                   /* FALLTHRU */

                case NFILTSW:
                case FRMTSW:
                case NFRMTSW:
                case NFILTSW:
                case FRMTSW:
                case NFRMTSW:


@@ -1173,56 +1118,66 @@ sendit (char *sp, char **arg, char *file, int pushed)
                case NMSGDSW:
                case WATCSW:
                case NWATCSW:
                case NMSGDSW:
                case WATCSW:
                case NWATCSW:

-               case SNOOPSW:

                case SASLSW:
                case NOSASLSW:
                case TLSSW:
                case INITTLSSW:
                case NTLSSW:
                case SASLSW:
                case NOSASLSW:
                case TLSSW:
                case INITTLSSW:
                case NTLSSW:

+               case CERTVERSW:
+               case NOCERTVERSW:
+                   vec[vecp++] = --cp;
+                   continue;
+
+               case SNOOPSW:
+                    snoop++;

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

+               case AUTHSERVICESW:
+#ifdef OAUTH_SUPPORT
+                   if (!(auth_svc = *argp++) || *auth_svc == '-')
+                       adios (NULL, "missing argument to %s", argp[-2]);
+#else
+                    NMH_UNUSED (user);
+                    NMH_UNUSED (auth_svc);
+                   adios (NULL, "not built with OAuth support");
+#endif
+                   continue;
+
+               case SASLMECHSW:
+                    saslmech = *argp;
+                   /* FALLTHRU */

                case ALIASW:
                case FILTSW:
                case WIDTHSW:
                case CLIESW:
                case SERVSW:
                case ALIASW:
                case FILTSW:
                case WIDTHSW:
                case CLIESW:
                case SERVSW:

-               case SASLMXSSFSW:
-               case SASLMECHSW:

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

+               case MTSSM:

                case MTSSW:
                case MESSAGEIDSW:
                    vec[vecp++] = --cp;
                    if (!(cp = *argp++) || *cp == '-') {
                case MTSSW:
                case MESSAGEIDSW:
                    vec[vecp++] = --cp;
                    if (!(cp = *argp++) || *cp == '-') {

-                       advise (NULL, "missing argument to %s", argp[-2]);
+                       inform("missing argument to %s", argp[-2]);

                        return;
                    }
                    vec[vecp++] = cp;
                        return;
                    }
                    vec[vecp++] = cp;

+                    user = cp;

                    continue;
 
                case SDRFSW:
                case SDRMSW:
                    if (!(cp = *argp++) || *cp == '-') {
                    continue;
 
                case SDRFSW:
                case SDRMSW:
                    if (!(cp = *argp++) || *cp == '-') {

-                       advise (NULL, "missing argument to %s", argp[-2]);
+                       inform("missing argument to %s", argp[-2]);

                        return;
                    }
                        return;
                    }

+                   /* FALLTHRU */

                case SNDRFSW:
                    continue;
                case SNDRFSW:
                    continue;

-
-               case SNDATTACHSW:
-                   advise(NULL, "The -attach switch is deprecated");
-                   continue;
-               case SNDNOATTACHSW:
-                   advise(NULL, "The -noattach switch is deprecated");
-                   continue;
-
-               case SNDATTACHFORMAT:
-                   advise(NULL, "The -attachformat switch is deprecated");
-                   continue;

            }
        }
            }
        }

-       advise (NULL, "usage: %s [switches]", sp);
+       inform("usage: %s [switches]", sp);

        return;
     }
 
        return;
     }
 


@@ -1230,7 +1185,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
     if ((cp = context_find ("Aliasfile"))) {
        char **ap, *dp;
 
     if ((cp = context_find ("Aliasfile"))) {
        char **ap, *dp;
 

-       dp = getcpy (cp);
+       dp = mh_xstrdup(cp);

        for (ap = brkstring (dp, " ", "\n"); ap && *ap; ap++) {
            vec[vecp++] = "-alias";
            vec[vecp++] = *ap;
        for (ap = brkstring (dp, " ", "\n"); ap && *ap; ap++) {
            vec[vecp++] = "-alias";
            vec[vecp++] = *ap;


@@ -1239,7 +1194,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
 
     if ((cp = getenv ("SIGNATURE")) == NULL || *cp == 0)
        if ((cp = context_find ("signature")) && *cp)
 
     if ((cp = getenv ("SIGNATURE")) == NULL || *cp == 0)
        if ((cp = context_find ("signature")) && *cp)

-           m_putenv ("SIGNATURE", cp);
+           setenv("SIGNATURE", cp, 1);

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


@@ -1255,14 +1210,32 @@ sendit (char *sp, char **arg, char *file, int pushed)
 #endif /* not lint */
            && altmsg) {
        vec[vecp++] = "-dist";
 #endif /* not lint */
            && altmsg) {
        vec[vecp++] = "-dist";

-       distfile = getcpy (m_mktemp2(altmsg, invo_name, NULL, NULL));
-       unlink(distfile);
+       if ((cp = m_mktemp2(altmsg, invo_name, NULL, NULL)) == NULL) {
+           adios(NULL, "unable to create temporary file in %s",
+                 get_temp_dir());
+       }
+       distfile = mh_xstrdup(cp);
+       (void) m_unlink(distfile);

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

+#ifdef OAUTH_SUPPORT
+    if (auth_svc == NULL) {
+        if (saslmech  &&  ! strcasecmp(saslmech, "xoauth2")) {
+            adios (NULL, "must specify -authservice with -saslmech xoauth2");
+        }
+    } else {
+        if (user == NULL) {
+            adios (NULL, "must specify -user with -saslmech xoauth2");
+        }
+    }
+#else
+    NMH_UNUSED(saslmech);
+#endif /* OAUTH_SUPPORT */
+

     if (altmsg == NULL || stat (altmsg, &st) == NOTOK) {
        st.st_mtime = 0;
        st.st_dev = 0;
     if (altmsg == NULL || stat (altmsg, &st) == NOTOK) {
        st.st_mtime = 0;
        st.st_dev = 0;


@@ -1273,7 +1246,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
 
     closefds (3);
 
 
     closefds (3);
 

-    if (sendsbr (vec, vecp, program, file, &st, 1) == OK)
+    if (sendsbr (vec, vecp, program, file, &st, 1, auth_svc) == OK)

        done (0);
 }
 
        done (0);
 }
 


@@ -1298,10 +1271,10 @@ whomfile (char **arg, char *file)
 
        case OK:
            vec = argsplit(whomproc, &program, &vecp);
 
        case OK:
            vec = argsplit(whomproc, &program, &vecp);

-           vec[vecp++] = file;

            if (arg)
                while (*arg)
                    vec[vecp++] = *arg++;
            if (arg)
                while (*arg)
                    vec[vecp++] = *arg++;

+           vec[vecp++] = file;

            vec[vecp] = NULL;
 
            execvp (program, vec);
            vec[vecp] = NULL;
 
            execvp (program, vec);


@@ -1322,8 +1295,50 @@ whomfile (char **arg, char *file)
 static int
 removefile (char *drft)
 {
 static int
 removefile (char *drft)
 {

-    if (unlink (drft) == NOTOK)
+    if (m_unlink (drft) == NOTOK)

        adios (drft, "unable to unlink");
 
     return OK;
 }
        adios (drft, "unable to unlink");
 
     return OK;
 }

+
+
+/*
+ * Return 1 if we already have a MIME-Version header, 0 otherwise.
+ */
+
+static int
+checkmimeheader (char *drft)
+{
+    FILE *f;
+    m_getfld_state_t gstate = 0;
+    char buf[NMH_BUFSIZ], name[NAMESZ];
+    int state, retval = 0;
+
+    if ((f = fopen(drft, "r")) == NULL) {
+       admonish(drft, "unable to read draft");
+       return (0);
+    }
+
+    for (;;) {
+       int bufsz = sizeof(buf);
+       switch (state = m_getfld(&gstate, name, buf, &bufsz, f)) {
+       case FLD:
+       case FLDPLUS:
+           if (strcasecmp(name, VRSN_FIELD) == 0) {
+               inform("Cannot use attach commands with already-"
+                      "formatted MIME message \"%s\"", drft);
+               retval = 1;
+               break;
+           }
+           continue;
+       default:
+           break;
+       }
+       break;
+    }
+
+    m_getfld_state_destroy(&gstate);
+    fclose(f);
+
+    return retval;
+}