lock_file.c: close(2) file descriptor on failure, avoiding leak.

[nmh] / uip / whatnowsbr.c

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index b9518e8b8b9c7bebd3f6b30255fc8b5b9c9ea0ac..72b315f41be2b7c24b724a112e4c263fa46ea0bc 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


@@ -43,10 +41,12 @@
 #include <fcntl.h>
 #include <h/mime.h>
 #include <h/utils.h>
 #include <fcntl.h>
 #include <h/mime.h>
 #include <h/utils.h>

-

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

+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
+#include "sbr/mime_type.h"

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


@@ -57,8 +57,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,


@@ -144,7 +142,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");
     }
 


@@ -197,26 +195,17 @@ 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)
            adios (NULL, "only one draft at a time!");
            }
        }
        if (drft)
            adios (NULL, "only one draft at a time!");

-       else
-           drft = cp;
+        drft = cp;

     }
 
     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);


@@ -237,9 +226,9 @@ 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 */
            (void) m_unlink (LINK);
            done (1);
 #endif /* READLINE_SUPPORT */
            (void) m_unlink (LINK);
            done (1);


@@ -250,7 +239,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:


@@ -284,7 +273,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);
 


@@ -318,20 +307,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) {
+           if ((f = popen_in_dir(cwd, buf, "r")) != NULL) {

                if (fgets(cwd, sizeof (cwd), f) == NULL) {
                    advise (buf, "fgets");
                }
                if (fgets(cwd, sizeof (cwd), f) == NULL) {
                    advise (buf, "fgets");
                }

-
-               if (strchr(cwd, '\n') != (char *)0)
-                       *strchr(cwd, '\n') = '\0';
-
+                trim_suffix_c(cwd, '\n');

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


@@ -342,7 +328,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:


@@ -366,10 +352,10 @@ WhatNow (int argc, char **argv)
            if (checkmimeheader(drft))
                break;
 
            if (checkmimeheader(drft))
                break;
 

-           l = (char *)0;
+           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 = "/";
 


@@ -388,7 +374,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);


@@ -415,8 +401,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;
            }
 


@@ -434,11 +420,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));


@@ -476,7 +462,7 @@ WhatNow (int argc, char **argv)
            if (checkmimeheader(drft))
                break;
 
            if (checkmimeheader(drft))
                break;
 

-           for (n = 0, arguments = argp + 1; *arguments != (char *)0; arguments++) {
+           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;


@@ -491,15 +477,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 = "";


@@ -521,9 +507,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);


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

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

            break;
        }
     }
            break;
        }
     }


@@ -565,7 +551,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;
 


@@ -573,7 +559,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;


@@ -721,8 +707,8 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
            }
            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);


@@ -744,9 +730,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"? */


@@ -815,7 +801,7 @@ static int
 sendfile (char **arg, char *file, int pushsw)
 {
     pid_t child_id;
 sendfile (char **arg, char *file, int pushsw)
 {
     pid_t child_id;

-    int i, vecp;
+    int vecp;

     char *cp, *sp, **vec, *program;
 
     /*
     char *cp, *sp, **vec, *program;
 
     /*


@@ -832,11 +818,11 @@ sendfile (char **arg, char *file, int pushsw)
     context_save ();   /* save the context file */
     fflush (stdout);
 
     context_save ();   /* save the context file */
     fflush (stdout);
 

-    for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
-       sleep (5);
+    child_id = fork();

     switch (child_id) {
        case NOTOK:
     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)


@@ -942,22 +928,20 @@ buildfile (char **argp, char *file)
     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("authservice", SASLminc(-11), AUTHSERVICESW) \
-    X("user username", 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("sendmail program", 0, MTSSM) \
     X("mts smtp|sendmail/smtp|sendmail/pipe", 2, MTSSW) \
     X("messageid localname|random", 2, MESSAGEIDSW) \


@@ -1073,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:


@@ -1093,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;


@@ -1121,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:


@@ -1138,6 +1123,8 @@ sendit (char *sp, char **arg, char *file, int pushed)
                case TLSSW:
                case INITTLSSW:
                case NTLSSW:
                case TLSSW:
                case INITTLSSW:
                case NTLSSW:

+               case CERTVERSW:
+               case NOCERTVERSW:

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


@@ -1159,13 +1146,12 @@ sendit (char *sp, char **arg, char *file, int pushed)
 
                case SASLMECHSW:
                     saslmech = *argp;
 
                case SASLMECHSW:
                     saslmech = *argp;

-                   /* fall thru */
+                   /* FALLTHRU */

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

-               case SASLMXSSFSW:

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


@@ -1173,7 +1159,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
                case MESSAGEIDSW:
                    vec[vecp++] = --cp;
                    if (!(cp = *argp++) || *cp == '-') {
                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;


@@ -1183,25 +1169,15 @@ sendit (char *sp, char **arg, char *file, int pushed)
                case SDRFSW:
                case SDRMSW:
                    if (!(cp = *argp++) || *cp == '-') {
                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;
                    }

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

                    continue;
                    continue;

-
-               case SNDATTACHFORMAT:
-                   advise(NULL, "The -attachformat switch is deprecated");
+               case SNDRFSW:

                    continue;
            }
        }
                    continue;
            }
        }

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

        return;
     }
 
        return;
     }
 


@@ -1209,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;


@@ -1218,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;


@@ -1238,7 +1214,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
            adios(NULL, "unable to create temporary file in %s",
                  get_temp_dir());
        }
            adios(NULL, "unable to create temporary file in %s",
                  get_temp_dir());
        }

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

        (void) m_unlink(distfile);
        if (link (altmsg, distfile) == NOTOK)
            adios (distfile, "unable to link %s to", altmsg);
        (void) m_unlink(distfile);
        if (link (altmsg, distfile) == NOTOK)
            adios (distfile, "unable to link %s to", altmsg);


@@ -1255,13 +1231,6 @@ sendit (char *sp, char **arg, char *file, int pushed)
         if (user == NULL) {
             adios (NULL, "must specify -user with -saslmech xoauth2");
         }
         if (user == NULL) {
             adios (NULL, "must specify -user with -saslmech xoauth2");
         }

-
-        vec[vecp++] = "-authservice";
-        if (saslmech  &&  ! strcasecmp(saslmech, "xoauth2")) {
-            vec[vecp++] = mh_oauth_do_xoauth (user, auth_svc, snoop ? stderr : NULL);
-        } else {
-            vec[vecp++] = auth_svc;
-        }

     }
 #else
     NMH_UNUSED(saslmech);
     }
 #else
     NMH_UNUSED(saslmech);


@@ -1277,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);
 }
 


@@ -1334,15 +1303,15 @@ removefile (char *drft)
 
 
 /*
 
 
 /*

- * Return 1 if we already have a MIME-Verson header, 0 otherwise.
+ * Return 1 if we already have a MIME-Version header, 0 otherwise.

  */
 
 static int
 checkmimeheader (char *drft)
 {
     FILE *f;
  */
 
 static int
 checkmimeheader (char *drft)
 {
     FILE *f;

-    m_getfld_state_t gstate = 0;
-    char buf[BUFSIZ], name[NAMESZ];
+    m_getfld_state_t gstate;
+    char buf[NMH_BUFSIZ], name[NAMESZ];

     int state, retval = 0;
 
     if ((f = fopen(drft, "r")) == NULL) {
     int state, retval = 0;
 
     if ((f = fopen(drft, "r")) == NULL) {


@@ -1350,13 +1319,14 @@ checkmimeheader (char *drft)
        return (0);
     }
 
        return (0);
     }
 

+    gstate = m_getfld_state_init(f);

     for (;;) {
        int bufsz = sizeof(buf);
     for (;;) {
        int bufsz = sizeof(buf);

-       switch (state = m_getfld(&gstate, name, buf, &bufsz, f)) {
+       switch (state = m_getfld2(&gstate, name, buf, &bufsz)) {

        case FLD:
        case FLDPLUS:
            if (strcasecmp(name, VRSN_FIELD) == 0) {
        case FLD:
        case FLDPLUS:
            if (strcasecmp(name, VRSN_FIELD) == 0) {

-               advise(NULL, "Cannot use attach commands with already-"
+               inform("Cannot use attach commands with already-"

                       "formatted MIME message \"%s\"", drft);
                retval = 1;
                break;
                       "formatted MIME message \"%s\"", drft);
                retval = 1;
                break;