seq_del.c: Move interface to own file.

[nmh] / uip / sendsbr.c

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 796b58eab43bda32a675ed50fc22ecdd3569eb98..ca03877ab682d62772de3ec8ff81cb30bc1474aa 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -5,16 +5,18 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

-#include <h/mh.h>
-#include <h/fmt_scan.h>
-#include <h/fmt_compile.h>
-#include <h/signals.h>
+#include "h/mh.h"
+#include "sbr/arglist.h"
+#include "sbr/error.h"
+#include "h/fmt_scan.h"
+#include "h/fmt_compile.h"
+#include "h/signals.h"

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

-#include <h/mime.h>
-#include <h/tws.h>
-#include <h/utils.h>
-#include <h/mts.h>
+#include "h/mime.h"
+#include "h/tws.h"
+#include "h/utils.h"
+#include "h/mts.h"

 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>


@@ -22,23 +24,24 @@
 #include <time.h>
 
 #ifdef OAUTH_SUPPORT
 #include <time.h>
 
 #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/message_id.h"
+#include "h/done.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
+#include "sbr/message_id.h"

 
 #ifdef OAUTH_SUPPORT
 static int setup_oauth_params(char *[], int *, const char *, const char **);
 #endif /* OAUTH_SUPPORT */
 
 int debugsw = 0;               /* global */
 
 #ifdef OAUTH_SUPPORT
 static int setup_oauth_params(char *[], int *, const char *, const char **);
 #endif /* OAUTH_SUPPORT */
 
 int debugsw = 0;               /* global */

-int forwsw  = 1;
+bool forwsw = true;

 int inplace = 1;
 int inplace = 1;

-int pushsw  = 0;
+bool pushsw;

 int splitsw = -1;
 int splitsw = -1;

-int unique  = 0;
-int verbsw  = 0;
+bool unique;
+bool verbsw;

 
 char *altmsg   = NULL;         /*  .. */
 char *annotext = NULL;
 
 char *altmsg   = NULL;         /*  .. */
 char *annotext = NULL;


@@ -100,7 +103,7 @@ sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st,
        execvp(buildprogram, buildvec);
        fprintf(stderr, "unable to exec ");
        perror(buildmimeproc);
        execvp(buildprogram, buildvec);
        fprintf(stderr, "unable to exec ");
        perror(buildmimeproc);

-       _exit(-1);
+       _exit(1);

        break;
 
     default:
        break;
 
     default:


@@ -109,7 +112,7 @@ sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st,
        break;
     }
 
        break;
     }
 

-    done=armed_done;
+    set_done(armed_done);

     switch (setjmp (env)) {
     case OK:
        /*
     switch (setjmp (env)) {
     case OK:
        /*


@@ -119,8 +122,7 @@ sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st,
        if (pushsw && unique) {
            char *cp = m_mktemp2(drft, invo_name, NULL, NULL);
            if (cp == NULL) {
        if (pushsw && unique) {
            char *cp = m_mktemp2(drft, invo_name, NULL, NULL);
            if (cp == NULL) {

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

            }
            if (rename (drft, strncpy(file, cp, sizeof(file))) == NOTOK)
                adios (file, "unable to rename %s to", drft);
            }
            if (rename (drft, strncpy(file, cp, sizeof(file))) == NOTOK)
                adios (file, "unable to rename %s to", drft);


@@ -135,10 +137,10 @@ sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st,
 #ifdef OAUTH_SUPPORT
                const char *errmsg;
                if (setup_oauth_params(vec, nvecsp, auth_svc, &errmsg) != OK) {
 #ifdef OAUTH_SUPPORT
                const char *errmsg;
                if (setup_oauth_params(vec, nvecsp, auth_svc, &errmsg) != OK) {

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

                }
 #else
                }
 #else

-                adios(NULL, "send built without OAUTH_SUPPORT, "
+                die("send built without OAUTH_SUPPORT, "

                       "so auth_svc %s is not supported", auth_svc);
 #endif /* OAUTH_SUPPORT */
        }
                       "so auth_svc %s is not supported", auth_svc);
 #endif /* OAUTH_SUPPORT */
        }


@@ -175,7 +177,7 @@ sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st,
        break;
     }
 
        break;
     }
 

-    done=exit;
+    set_done(exit);

     if (distfile)
        (void) m_unlink (distfile);
 
     if (distfile)
        (void) m_unlink (distfile);
 


@@ -276,17 +278,17 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
 
           case LENERR:
           case FMTERR:
 
           case LENERR:
           case FMTERR:

-               adios (NULL, "message format error in component #%d", compnum);
+               die("message format error in component #%d", compnum);

 
           default:
 
           default:

-               adios (NULL, "getfld () returned %d", state);
+               die("getfld () returned %d", state);

        }
 
        break;
     }
     m_getfld_state_destroy (&gstate);
     if (cp == NULL)
        }
 
        break;
     }
     m_getfld_state_destroy (&gstate);
     if (cp == NULL)

-       adios (NULL, "headers missing from draft");
+       die("headers missing from draft");

 
     nparts = 1;
     pos = start;
 
     nparts = 1;
     pos = start;


@@ -302,7 +304,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
     /* Only one part, nothing to split */
     if (nparts == 1) {
        free (cp);
     /* Only one part, nothing to split */
     if (nparts == 1) {
        free (cp);

-        mh_xfree(dp);
+        free(dp);

 
        fclose (in);
        return sendaux (vec, vecp, program, drft, st);
 
        fclose (in);
        return sendaux (vec, vecp, program, drft, st);


@@ -329,8 +331,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
 
        char *cp = m_mktemp2(drft, invo_name, NULL, &out);
         if (cp == NULL) {
 
        char *cp = m_mktemp2(drft, invo_name, NULL, &out);
         if (cp == NULL) {

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

         }
        strncpy(tmpdrf, cp, sizeof(tmpdrf));
 
         }
        strncpy(tmpdrf, cp, sizeof(tmpdrf));
 


@@ -363,7 +364,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
            if (!fgets (buffer, sizeof buffer, in)) {
                if (partno == nparts)
                    break;
            if (!fgets (buffer, sizeof buffer, in)) {
                if (partno == nparts)
                    break;

-               adios (NULL, "premature eof");
+               die("premature eof");

            }
 
            if ((pos += (len = strlen (buffer))) > CPERMSG) {
            }
 
            if ((pos += (len = strlen (buffer))) > CPERMSG) {


@@ -408,7 +409,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
     }
 
     free (cp);
     }
 
     free (cp);

-    mh_xfree(dp);
+    free(dp);

 
     fclose (in);       /* close the draft */
     return status;
 
     fclose (in);       /* close the draft */
     return status;


@@ -424,7 +425,7 @@ static int
 sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st)
 {
     pid_t child_id;
 sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st)
 {
     pid_t child_id;

-    int i, status, fd, fd2;
+    int status, fd, fd2;

     char backup[BUFSIZ], buf[BUFSIZ];
 
     fd = pushsw ? tmp_fd () : NOTOK;
     char backup[BUFSIZ], buf[BUFSIZ];
 
     fd = pushsw ? tmp_fd () : NOTOK;


@@ -445,9 +446,7 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st)
        done (1);
     vec[vecp] = NULL;
 
        done (1);
     vec[vecp] = NULL;
 

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

     switch (child_id) {
     case -1:
        /* oops -- fork error */
     switch (child_id) {
     case -1:
        /* oops -- fork error */


@@ -469,7 +468,7 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st)
        execvp (program, vec);
        fprintf (stderr, "unable to exec ");
        perror (postproc);
        execvp (program, vec);
        fprintf (stderr, "unable to exec ");
        perror (postproc);

-       _exit (-1);
+       _exit(1);

 
     default:
        /*
 
     default:
        /*


@@ -514,14 +513,12 @@ static void
 alert (char *file, int out)
 {
     pid_t child_id;
 alert (char *file, int out)
 {
     pid_t child_id;

-    int i, in, argp;
+    int in, argp;

     char buf[BUFSIZ];
     char *program;
     char **arglist;
 
     char buf[BUFSIZ];
     char *program;
     char **arglist;
 

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

     switch (child_id) {
        case NOTOK:
            /* oops -- fork error */
     switch (child_id) {
        case NOTOK:
            /* oops -- fork error */


@@ -574,7 +571,7 @@ alert (char *file, int out)
            execvp (program, arglist);
            fprintf (stderr, "unable to exec ");
            perror (mailproc);
            execvp (program, arglist);
            fprintf (stderr, "unable to exec ");
            perror (mailproc);

-           _exit (-1);
+           _exit(1);

 
        default:                /* no waiting... */
            break;
 
        default:                /* no waiting... */
            break;


@@ -592,9 +589,8 @@ tmp_fd (void)
 
     if (debugsw)
        inform("temporary file %s selected", tfile);
 
     if (debugsw)
        inform("temporary file %s selected", tfile);

-    else
-       if (m_unlink (tfile) == NOTOK)
-           advise (tfile, "unable to remove");
+    else if (m_unlink (tfile) == NOTOK)
+        advise (tfile, "unable to remove");

 
     return fd;
 }
 
     return fd;
 }


@@ -744,9 +740,9 @@ oops:
 }
 
 
 }
 
 

-static
-void
-handle_sendfrom(char **vec, int *vecp, char *draft, const char *auth_svc) {
+static void
+handle_sendfrom(char **vec, int *vecp, char *draft, const char *auth_svc)
+{

     const char *addr, *host;
     const char *message;
 
     const char *addr, *host;
     const char *message;
 


@@ -769,12 +765,12 @@ handle_sendfrom(char **vec, int *vecp, char *draft, const char *auth_svc) {
             if (strcmp(*vp, "xoauth2") == 0) {
 #ifdef OAUTH_SUPPORT
                 if (setup_oauth_params(vec, vecp, auth_svc, &message) != OK) {
             if (strcmp(*vp, "xoauth2") == 0) {
 #ifdef OAUTH_SUPPORT
                 if (setup_oauth_params(vec, vecp, auth_svc, &message) != OK) {

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

                 }
                 break;
 #else
                 NMH_UNUSED(auth_svc);
                 }
                 break;
 #else
                 NMH_UNUSED(auth_svc);

-                adios(NULL, "send built without OAUTH_SUPPORT, "
+                die("send built without OAUTH_SUPPORT, "

                       "so -saslmech xoauth2 is not supported");
 #endif /* OAUTH_SUPPORT */
             }
                       "so -saslmech xoauth2 is not supported");
 #endif /* OAUTH_SUPPORT */
             }


@@ -789,7 +785,8 @@ handle_sendfrom(char **vec, int *vecp, char *draft, const char *auth_svc) {
  */
 static int
 setup_oauth_params(char *vec[], int *vecp, const char *auth_svc,
  */
 static int
 setup_oauth_params(char *vec[], int *vecp, const char *auth_svc,

-                  const char **message) {
+                  const char **message)
+{

     const char *saslmech = NULL, *user = NULL;
     mh_oauth_service_info svc;
     char errbuf[256];
     const char *saslmech = NULL, *user = NULL;
     mh_oauth_service_info svc;
     char errbuf[256];


@@ -822,13 +819,13 @@ setup_oauth_params(char *vec[], int *vecp, const char *auth_svc,
         if (saslmech  &&  ! strcasecmp(saslmech, "xoauth2")) {
            if (! mh_oauth_get_service_info(auth_svc, &svc, errbuf,
                                            sizeof(errbuf)))
         if (saslmech  &&  ! strcasecmp(saslmech, "xoauth2")) {
            if (! mh_oauth_get_service_info(auth_svc, &svc, errbuf,
                                            sizeof(errbuf)))

-               adios(NULL, "Unable to retrieve oauth profile entries: %s",
+               die("Unable to retrieve oauth profile entries: %s",

                      errbuf);
 
            vec[(*vecp)++] = mh_xstrdup("-authservice");
            vec[(*vecp)++] = mh_xstrdup(auth_svc);
            vec[(*vecp)++] = mh_xstrdup("-oauthcredfile");
                      errbuf);
 
            vec[(*vecp)++] = mh_xstrdup("-authservice");
            vec[(*vecp)++] = mh_xstrdup(auth_svc);
            vec[(*vecp)++] = mh_xstrdup("-oauthcredfile");

-           vec[(*vecp)++] = mh_xstrdup(mh_oauth_cred_fn(auth_svc));
+           vec[(*vecp)++] = mh_oauth_cred_fn(auth_svc);

            vec[(*vecp)++] = mh_xstrdup("-oauthclientid");
            vec[(*vecp)++] = getcpy(svc.client_id);
            vec[(*vecp)++] = mh_xstrdup("-oauthclientsecret");
            vec[(*vecp)++] = mh_xstrdup("-oauthclientid");
            vec[(*vecp)++] = getcpy(svc.client_id);
            vec[(*vecp)++] = mh_xstrdup("-oauthclientsecret");


@@ -852,9 +849,9 @@ setup_oauth_params(char *vec[], int *vecp, const char *auth_svc,
 /*
  * Extract user and domain from From: header line in draft.
  */
 /*
  * Extract user and domain from From: header line in draft.
  */

-static
-int
-get_from_header_info(const char *filename, const char **addr, const char **host, const char **message) {
+static int
+get_from_header_info(const char *filename, const char **addr, const char **host, const char **message)
+{

     struct stat st;
     FILE *in;
 
     struct stat st;
     FILE *in;
 


@@ -906,13 +903,13 @@ get_from_header_info(const char *filename, const char **addr, const char **host,
  * Get formatted information from header of a message.
  * Adapted from process_single_file() in uip/fmttest.c.
  */
  * Get formatted information from header of a message.
  * Adapted from process_single_file() in uip/fmttest.c.
  */

-static
-const char *
-get_message_header_info(FILE *in, char *format) {
+static const char *
+get_message_header_info(FILE *in, char *format)
+{

     int dat[5];
     struct format *fmt;
     struct stat st;
     int dat[5];
     struct format *fmt;
     struct stat st;

-    int parsing_header;
+    bool parsing_header;

     m_getfld_state_t gstate;
     charstring_t buffer = charstring_create(0);
     char *retval;
     m_getfld_state_t gstate;
     charstring_t buffer = charstring_create(0);
     char *retval;


@@ -928,7 +925,7 @@ get_message_header_info(FILE *in, char *format) {
      * Read in the message and process the header.
      */
     rewind (in);
      * Read in the message and process the header.
      */
     rewind (in);

-    parsing_header = 1;
+    parsing_header = true;

     gstate = m_getfld_state_init(in);
     do {
         char name[NAMESZ], rbuf[NMH_BUFSIZ];
     gstate = m_getfld_state_init(in);
     do {
         char name[NAMESZ], rbuf[NMH_BUFSIZ];


@@ -955,7 +952,7 @@ get_message_header_info(FILE *in, char *format) {
             break;
         }
         default:
             break;
         }
         default:

-            parsing_header = 0;
+            parsing_header = false;

         }
     } while (parsing_header);
     m_getfld_state_destroy(&gstate);
         }
     } while (parsing_header);
     m_getfld_state_destroy(&gstate);


@@ -984,9 +981,9 @@ get_message_header_info(FILE *in, char *format) {
  * If no -server passed in from profile or commandline, could use smtp.<svc>.com for gmail,
  * but that might not generalize for other svcs.
  */
  * If no -server passed in from profile or commandline, could use smtp.<svc>.com for gmail,
  * but that might not generalize for other svcs.
  */

-static
-void
-merge_profile_entry(const char *addr, const char *host, char *vec[], int *vecp) {
+static void
+merge_profile_entry(const char *addr, const char *host, char *vec[], int *vecp)
+{

     char *addr_entry = concat("sendfrom-", addr, NULL);
     char *profile_entry = context_find(addr_entry);
 
     char *addr_entry = concat("sendfrom-", addr, NULL);
     char *profile_entry = context_find(addr_entry);