vector.c: Move interface to own file.

[nmh] / uip / send.c

diff --git a/uip/send.c b/uip/send.c
index 297b8f043297146283c47d091244743f53f04966..d5ac70e57398d67d8235a17e7ce21262a370540c 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -5,14 +5,21 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

-#include <h/mh.h>
+#include "h/mh.h"
+#include "sbr/push.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/arglist.h"
+#include "sbr/error.h"

 #include <fcntl.h>
 #include <fcntl.h>

-#include <h/utils.h>
+#include "h/done.h"
+#include "h/utils.h"

 #ifdef OAUTH_SUPPORT
 #ifdef OAUTH_SUPPORT

-# include <h/oauth.h>
+#include "h/oauth.h"

 #endif
 #endif

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

 
 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)
 
 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)


@@ -97,12 +104,12 @@ DEFINE_SWITCH_ARRAY(USE, anyl);
 #undef X
 
 extern int debugsw;            /* from sendsbr.c */
 #undef X
 
 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;


@@ -112,8 +119,8 @@ extern char *distfile;
 int
 main (int argc, char **argv)
 {
 int
 main (int argc, char **argv)
 {

-    int msgp = 0, distsw = 0, vecp;
-    int isdf = 0, mime = 0;
+    int msgp = 0, vecp;
+    int isdf = 0;

     int msgnum, status;
     char *cp, *dfolder = NULL, *maildir = NULL;
     char buf[BUFSIZ], **ap, **argp, **arguments, *program;
     int msgnum, status;
     char *cp, *dfolder = NULL, *maildir = NULL;
     char buf[BUFSIZ], **ap, **argp, **arguments, *program;


@@ -121,10 +128,9 @@ main (int argc, char **argv)
     const char *user = NULL, *saslmech = NULL;
     struct msgs *mp;
     struct stat st;
     const char *user = NULL, *saslmech = NULL;
     struct msgs *mp;
     struct stat st;

-    int snoop = 0;

     char *auth_svc = NULL;
 
     char *auth_svc = NULL;
 

-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }

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


@@ -132,7 +138,7 @@ main (int argc, char **argv)
     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";


@@ -157,7 +163,7 @@ main (int argc, char **argv)
                    ambigsw (cp, switches);
                    done (1);
                case UNKWNSW: 
                    ambigsw (cp, switches);
                    done (1);
                case UNKWNSW: 

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

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


@@ -173,15 +179,15 @@ main (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 (!(cp = *argp++) || *cp == '-')
                    dfolder = path (*cp == '+' || *cp == '@' ? cp + 1 : cp,
                            *cp != '@' ? TFOLDER : TSUBCWF);
                    continue;
                case DMSGSW: 
                    if (!(cp = *argp++) || *cp == '-')

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

                    msgs[msgp++] = cp;
                    continue;
                case NDFLDSW: 
                    msgs[msgp++] = cp;
                    continue;
                case NDFLDSW: 


@@ -190,51 +196,48 @@ main (int argc, char **argv)
                    continue;
 
                case PUSHSW: 
                    continue;
 
                case PUSHSW: 

-                   pushsw++;
+                   pushsw = true;

                    continue;
                case NPUSHSW: 
                    continue;
                case NPUSHSW: 

-                   pushsw = 0;
+                   pushsw = false;

                    continue;
 
                case SPLITSW: 
                    if (!(cp = *argp++) || sscanf (cp, "%d", &splitsw) != 1)
                    continue;
 
                case SPLITSW: 
                    if (!(cp = *argp++) || sscanf (cp, "%d", &splitsw) != 1)

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

                    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;
 
                case MIMESW:
                    vec[vecp++] = --cp;
                    continue;
 
                case MIMESW:

-                   mime++;

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

-                   mime = 0;

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

-                    snoop++;

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


@@ -263,7 +266,7 @@ main (int argc, char **argv)
                case USERSW:
                    vec[vecp++] = --cp;
                    if (!(cp = *argp++) || *cp == '-')
                case USERSW:
                    vec[vecp++] = --cp;
                    if (!(cp = *argp++) || *cp == '-')

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

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


@@ -271,15 +274,15 @@ main (int argc, char **argv)
                case AUTHSERVICESW:
 #ifdef OAUTH_SUPPORT
                    if (!(auth_svc = *argp++) || *auth_svc == '-')
                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
 #else

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

 #endif
                    continue;
 
                case SASLMECHSW:
                    if (!(saslmech = *argp) || *saslmech == '-')
 #endif
                    continue;
 
                case SASLMECHSW:
                    if (!(saslmech = *argp) || *saslmech == '-')

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

                    /* FALLTHRU */
 
                case ALIASW: 
                    /* FALLTHRU */
 
                case ALIASW: 


@@ -293,7 +296,7 @@ main (int argc, char **argv)
                case MESSAGEIDSW:
                    vec[vecp++] = --cp;
                    if (!(cp = *argp++) || *cp == '-')
                case MESSAGEIDSW:
                    vec[vecp++] = --cp;
                    if (!(cp = *argp++) || *cp == '-')

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

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


@@ -316,7 +319,7 @@ main (int argc, char **argv)
 
     if (dfolder == NULL) {
        if (msgp == 0) {
 
     if (dfolder == NULL) {
        if (msgp == 0) {

-           msgs[msgp++] = getcpy (m_draft (NULL, NULL, 1, &isdf));
+           msgs[msgp++] = mh_xstrdup(m_draft(NULL, NULL, 1, &isdf));

            if (stat (msgs[0], &st) == NOTOK)
                adios (msgs[0], "unable to stat draft file");
            cp = concat ("Use \"", msgs[0], "\"? ", NULL);
            if (stat (msgs[0], &st) == NOTOK)
                adios (msgs[0], "unable to stat draft file");
            cp = concat ("Use \"", msgs[0], "\"? ", NULL);


@@ -338,7 +341,7 @@ main (int argc, char **argv)
            }
        } else {
            for (msgnum = 0; msgnum < msgp; msgnum++)
            }
        } else {
            for (msgnum = 0; msgnum < msgp; msgnum++)

-               msgs[msgnum] = getcpy (m_maildir (msgs[msgnum]));
+               msgs[msgnum] = mh_xstrdup(m_maildir(msgs[msgnum]));

        }
     } else {
        if (!context_find ("path"))
        }
     } else {
        if (!context_find ("path"))


@@ -353,11 +356,11 @@ main (int argc, char **argv)
 
        /* read folder and create message structure */
        if (!(mp = folder_read (dfolder, 1)))
 
        /* read folder and create message structure */
        if (!(mp = folder_read (dfolder, 1)))

-           adios (NULL, "unable to read folder %s", dfolder);
+           die("unable to read folder %s", dfolder);

 
        /* check for empty folder */
        if (mp->nummsg == 0)
 
        /* check for empty folder */
        if (mp->nummsg == 0)

-           adios (NULL, "no messages in %s", dfolder);
+           die("no messages in %s", dfolder);

 
        /* parse all the message ranges/sequences and set SELECTED */
        for (msgnum = 0; msgnum < msgp; msgnum++)
 
        /* parse all the message ranges/sequences and set SELECTED */
        for (msgnum = 0; msgnum < msgp; msgnum++)


@@ -397,12 +400,11 @@ go_to_it:
 
     if ((cp = getenv ("mhdist"))
            && *cp
 
     if ((cp = getenv ("mhdist"))
            && *cp

-           && (distsw = atoi (cp))
+           && atoi(cp)

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


@@ -416,7 +418,7 @@ go_to_it:
                adios (distfile, "unable to link %s to", altmsg);
            free (distfile);
            if ((cp = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
                adios (distfile, "unable to link %s to", altmsg);
            free (distfile);
            if ((cp = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {

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

                      get_temp_dir());
            }
            distfile = mh_xstrdup(cp);
                      get_temp_dir());
            }
            distfile = mh_xstrdup(cp);


@@ -441,11 +443,11 @@ go_to_it:
 #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