Use va_copy() to get a copy of va_list, instead of using original.

[nmh] / uip / whatnowsbr.c

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 98052e3800e157770f430d35c952fa4843b2859e..2f00ba586d47df50e849bd733b774e5eb133757c 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -44,6 +44,7 @@
 #ifdef OAUTH_SUPPORT
 # include <h/oauth.h>
 #endif
 #ifdef OAUTH_SUPPORT
 # include <h/oauth.h>
 #endif

+#include "h/done.h"

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


@@ -119,10 +120,12 @@ static int copyf (char *, char *);
 int
 WhatNow (int argc, char **argv)
 {
 int
 WhatNow (int argc, char **argv)
 {

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

     char *cp, *dfolder = NULL, *dmsg = NULL;
     char *ed = NULL, *drft = NULL, *msgnam = NULL;
     char *cp, *dfolder = NULL, *dmsg = NULL;
     char *ed = NULL, *drft = NULL, *msgnam = NULL;

-    char buf[BUFSIZ], prompt[BUFSIZ];
+    char buf[BUFSIZ];

     char **argp, **arguments;
     struct stat st;
     char       cwd[PATH_MAX + 1];      /* current working directory */
     char **argp, **arguments;
     struct stat st;
     char       cwd[PATH_MAX + 1];      /* current working directory */


@@ -153,7 +156,7 @@ WhatNow (int argc, char **argv)
                ambigsw (cp, whatnowswitches);
                done (1);
            case UNKWNSW:
                ambigsw (cp, whatnowswitches);
                done (1);
            case UNKWNSW:

-               adios (NULL, "-%s unknown", cp);
+               die("-%s unknown", cp);

 
            case HELPSW:
                snprintf (buf, sizeof(buf), "%s [switches] [file]", invo_name);
 
            case HELPSW:
                snprintf (buf, sizeof(buf), "%s [switches] [file]", invo_name);


@@ -165,17 +168,17 @@ WhatNow (int argc, char **argv)
 
            case DFOLDSW:
                if (dfolder)
 
            case DFOLDSW:
                if (dfolder)

-                   adios (NULL, "only one draft folder at a time!");
+                   die("only one draft folder at a time!");

                if (!(cp = *argp++) || *cp == '-')
                if (!(cp = *argp++) || *cp == '-')

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

                dfolder = path (*cp == '+' || *cp == '@' ? cp + 1 : cp,
                                *cp != '@' ? TFOLDER : TSUBCWF);
                continue;
            case DMSGSW:
                if (dmsg)
                dfolder = path (*cp == '+' || *cp == '@' ? cp + 1 : cp,
                                *cp != '@' ? TFOLDER : TSUBCWF);
                continue;
            case DMSGSW:
                if (dmsg)

-                   adios (NULL, "only one draft message at a time!");
+                   die("only one draft message at a time!");

                if (!(dmsg = *argp++) || *dmsg == '-')
                if (!(dmsg = *argp++) || *dmsg == '-')

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

                continue;
            case NDFLDSW:
                dfolder = NULL;
                continue;
            case NDFLDSW:
                dfolder = NULL;


@@ -184,26 +187,26 @@ WhatNow (int argc, char **argv)
 
            case EDITRSW:
                if (!(ed = *argp++) || *ed == '-')
 
            case EDITRSW:
                if (!(ed = *argp++) || *ed == '-')

-                   adios (NULL, "missing argument to %s", argp[-2]);
-               nedit = 0;
+                   die("missing argument to %s", argp[-2]);
+               nedit = false;

                continue;
            case NEDITSW:
                continue;
            case NEDITSW:

-               nedit++;
+               nedit = true;

                continue;
 
            case PRMPTSW:
                if (!(myprompt = *argp++) || *myprompt == '-')
                continue;
 
            case PRMPTSW:
                if (!(myprompt = *argp++) || *myprompt == '-')

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

                continue;
            }
        }
        if (drft)
                continue;
            }
        }
        if (drft)

-           adios (NULL, "only one draft at a time!");
+           die("only one draft at a time!");

         drft = cp;
     }
 
     if ((drft == NULL && (drft = getenv ("mhdraft")) == NULL) || *drft == 0)
         drft = cp;
     }
 
     if ((drft == NULL && (drft = getenv ("mhdraft")) == NULL) || *drft == 0)

-       drft = getcpy (m_draft (dfolder, dmsg, 1, &isdf));
+       drft = mh_xstrdup(m_draft(dfolder, dmsg, 1, &isdf));

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


@@ -215,7 +218,7 @@ WhatNow (int argc, char **argv)
 
     if (ed == NULL && ((ed = getenv ("mheditor")) == NULL || *ed == 0)) {
        ed = NULL;
 
     if (ed == NULL && ((ed = getenv ("mheditor")) == NULL || *ed == 0)) {
        ed = NULL;

-       nedit++;
+       nedit = true;

     }
 
     /* start editing the draft, unless -noedit was given */
     }
 
     /* start editing the draft, unless -noedit was given */


@@ -223,12 +226,11 @@ WhatNow (int argc, char **argv)
                            NULL, 1, atfile) < 0)
        done (1);
 
                            NULL, 1, atfile) < 0)
        done (1);
 

-    snprintf (prompt, sizeof(prompt), myprompt, invo_name);

     for (;;) {
 #ifdef READLINE_SUPPORT
     for (;;) {
 #ifdef READLINE_SUPPORT

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

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

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

 #endif /* READLINE_SUPPORT */
            (void) m_unlink (LINK);
            done (1);
 #endif /* READLINE_SUPPORT */
            (void) m_unlink (LINK);
            done (1);


@@ -386,7 +388,7 @@ WhatNow (int argc, char **argv)
             *  Attach files to current draft.
             */
 
             *  Attach files to current draft.
             */
 

-            int verbose = 0;
+            bool verbose = false;

             char **ap;
 
            if (checkmimeheader(drft))
             char **ap;
 
            if (checkmimeheader(drft))


@@ -395,7 +397,7 @@ WhatNow (int argc, char **argv)
            for (ap = argp+1; *ap; ++ap) {
                if (strcmp(*ap, "-v") == 0) {
                    ++argp;
            for (ap = argp+1; *ap; ++ap) {
                if (strcmp(*ap, "-v") == 0) {
                    ++argp;

-                   verbose = 1;
+                   verbose = true;

                } else if (*ap[0] != '-') {
                    break;
                }
                } else if (*ap[0] != '-') {
                    break;
                }


@@ -551,7 +553,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(NULL, "arguments too long");
+       die("arguments too long");

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


@@ -559,7 +561,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(NULL, "arguments too long");
+           die("arguments too long");

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


@@ -634,7 +636,7 @@ popen_in_dir(const char *dir, const char *cmd, const char *type)
  * EDIT
  */
 
  * EDIT
  */
 

-static int  reedit = 0;                /* have we been here before?     */
+static bool reedit;                    /* have we been here before?     */

 static char *edsave = NULL;    /* the editor we used previously */
 
 
 static char *edsave = NULL;    /* the editor we used previously */
 
 


@@ -647,7 +649,7 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
     char *cp, *prog, **vec;
     struct stat st;
 
     char *cp, *prog, **vec;
     struct stat st;
 

-    int        slinked = 0;
+    bool slinked = false;

 
     /* Was there a previous edit session? */
     if (reedit && (*ed || edsave)) {
 
     /* Was there a previous edit session? */
     if (reedit && (*ed || edsave)) {


@@ -683,9 +685,9 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
                if (symlink (altpath, linkpath) < 0) {
                    adios (linkpath, "symlink");
                }
                if (symlink (altpath, linkpath) < 0) {
                    adios (linkpath, "symlink");
                }

-               slinked = 1;
+               slinked = true;

            } else {
            } else {

-               slinked = 0;
+               slinked = false;

            }
        }
     }
            }
        }
     }


@@ -739,7 +741,7 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
                break;
            }
 
                break;
            }
 

-           reedit++;
+           reedit = true;

            if (altmsg
                    && mp
                    && !is_readonly(mp)
            if (altmsg
                    && mp
                    && !is_readonly(mp)


@@ -864,7 +866,7 @@ buildfile (char **argp, char *file)
        while (argp[i])
            i++;
     }
        while (argp[i])
            i++;
     }

-    args = (char **) mh_xmalloc((i + 2) * sizeof(char *));
+    args = mh_xmalloc((i + 2) * sizeof(char *));

 
     /*
      * For backward compatibility, we need to add -build
 
     /*
      * For backward compatibility, we need to add -build


@@ -956,12 +958,12 @@ DEFINE_SWITCH_ARRAY(SEND, sendswitches);
 
 
 extern int debugsw;            /* from sendsbr.c */
 
 
 extern int debugsw;            /* from sendsbr.c */

-extern int forwsw;
+extern bool forwsw;

 extern int inplace;
 extern int inplace;

-extern int pushsw;
+extern bool pushsw;

 extern int splitsw;
 extern int splitsw;

-extern int unique;
-extern int verbsw;
+extern bool unique;
+extern bool verbsw;

 
 extern char *altmsg;           /*  .. */
 extern char *annotext;
 
 extern char *altmsg;           /*  .. */
 extern char *annotext;


@@ -976,7 +978,6 @@ sendit (char *sp, char **arg, char *file, int pushed)
     char **arguments, *savearg[MAXARGS], **vec;
     const char *user = NULL, *saslmech = NULL;
     char *auth_svc = NULL;
     char **arguments, *savearg[MAXARGS], **vec;
     const char *user = NULL, *saslmech = NULL;
     char *auth_svc = NULL;

-    int snoop = 0;

     struct stat st;
 
     /*
     struct stat st;
 
     /*


@@ -1013,9 +1014,9 @@ sendit (char *sp, char **arg, char *file, int pushed)
     argp = arguments;
 
     debugsw = 0;
     argp = arguments;
 
     debugsw = 0;

-    forwsw = 1;
+    forwsw = true;

     inplace = 1;
     inplace = 1;

-    unique = 0;
+    unique = false;

 
     altmsg = NULL;
     annotext = NULL;
 
     altmsg = NULL;
     annotext = NULL;


@@ -1028,7 +1029,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
     vec = argsplit(postproc, &program, &vecp);
 
     vec[vecp++] = "-library";
     vec = argsplit(postproc, &program, &vecp);
 
     vec[vecp++] = "-library";

-    vec[vecp++] = getcpy (m_maildir (""));
+    vec[vecp++] = mh_xstrdup(m_maildir(""));

 
     if ((cp = context_find ("fileproc"))) {
        vec[vecp++] = "-fileproc";
 
     if ((cp = context_find ("fileproc"))) {
        vec[vecp++] = "-fileproc";


@@ -1079,24 +1080,24 @@ sendit (char *sp, char **arg, char *file, int pushed)
                    continue;
 
                case UNIQSW:
                    continue;
 
                case UNIQSW:

-                   unique++;
+                   unique = true;

                    continue;
                case NUNIQSW:
                    continue;
                case NUNIQSW:

-                   unique = 0;
+                   unique = false;

                    continue;
                case FORWSW:
                    continue;
                case FORWSW:

-                   forwsw++;
+                   forwsw = true;

                    continue;
                case NFORWSW:
                    continue;
                case NFORWSW:

-                   forwsw = 0;
+                   forwsw = false;

                    continue;
 
                case VERBSW:
                    continue;
 
                case VERBSW:

-                   verbsw++;
+                   verbsw = true;

                    vec[vecp++] = --cp;
                    continue;
                case NVERBSW:
                    vec[vecp++] = --cp;
                    continue;
                case NVERBSW:

-                   verbsw = 0;
+                   verbsw = false;

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


@@ -1125,18 +1126,17 @@ sendit (char *sp, char **arg, char *file, int pushed)
                    continue;
 
                case SNOOPSW:
                    continue;
 
                case SNOOPSW:

-                    snoop++;

                    vec[vecp++] = --cp;
                    continue;
 
                case AUTHSERVICESW:
 #ifdef OAUTH_SUPPORT
                    if (!(auth_svc = *argp++) || *auth_svc == '-')
                    vec[vecp++] = --cp;
                    continue;
 
                case AUTHSERVICESW:
 #ifdef OAUTH_SUPPORT
                    if (!(auth_svc = *argp++) || *auth_svc == '-')

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

 #else
                     NMH_UNUSED (user);
                     NMH_UNUSED (auth_svc);
 #else
                     NMH_UNUSED (user);
                     NMH_UNUSED (auth_svc);

-                   adios (NULL, "not built with OAuth support");
+                   die("not built with OAuth support");

 #endif
                    continue;
 
 #endif
                    continue;
 


@@ -1201,14 +1201,11 @@ sendit (char *sp, char **arg, char *file, int pushed)
 
     if ((cp = getenv ("mhdist"))
            && *cp
 
     if ((cp = getenv ("mhdist"))
            && *cp

-#ifndef lint

            && atoi(cp)
            && atoi(cp)

-#endif /* not lint */

            && altmsg) {
        vec[vecp++] = "-dist";
        if ((cp = m_mktemp2(altmsg, invo_name, NULL, NULL)) == NULL) {
            && altmsg) {
        vec[vecp++] = "-dist";
        if ((cp = m_mktemp2(altmsg, invo_name, NULL, NULL)) == NULL) {

-           adios(NULL, "unable to create temporary file in %s",
-                 get_temp_dir());
+           die("unable to create temporary file");

        }
        distfile = mh_xstrdup(cp);
        (void) m_unlink(distfile);
        }
        distfile = mh_xstrdup(cp);
        (void) m_unlink(distfile);


@@ -1221,11 +1218,11 @@ sendit (char *sp, char **arg, char *file, int pushed)
 #ifdef OAUTH_SUPPORT
     if (auth_svc == NULL) {
         if (saslmech  &&  ! strcasecmp(saslmech, "xoauth2")) {
 #ifdef OAUTH_SUPPORT
     if (auth_svc == NULL) {
         if (saslmech  &&  ! strcasecmp(saslmech, "xoauth2")) {

-            adios (NULL, "must specify -authservice with -saslmech xoauth2");
+            die("must specify -authservice with -saslmech xoauth2");

         }
     } else {
         if (user == NULL) {
         }
     } else {
         if (user == NULL) {

-            adios (NULL, "must specify -user with -saslmech xoauth2");
+            die("must specify -user with -saslmech xoauth2");

         }
     }
 #else
         }
     }
 #else


@@ -1308,7 +1305,8 @@ checkmimeheader (char *drft)
     FILE *f;
     m_getfld_state_t gstate;
     char buf[NMH_BUFSIZ], name[NAMESZ];
     FILE *f;
     m_getfld_state_t gstate;
     char buf[NMH_BUFSIZ], name[NAMESZ];

-    int state, retval = 0;
+    int state;
+    bool retval = false;

 
     if ((f = fopen(drft, "r")) == NULL) {
        admonish(drft, "unable to read draft");
 
     if ((f = fopen(drft, "r")) == NULL) {
        admonish(drft, "unable to read draft");


@@ -1324,7 +1322,7 @@ checkmimeheader (char *drft)
            if (strcasecmp(name, VRSN_FIELD) == 0) {
                inform("Cannot use attach commands with already-"
                       "formatted MIME message \"%s\"", drft);
            if (strcasecmp(name, VRSN_FIELD) == 0) {
                inform("Cannot use attach commands with already-"
                       "formatted MIME message \"%s\"", drft);

-               retval = 1;
+               retval = true;

                break;
            }
            continue;
                break;
            }
            continue;