It does just what it says on the tin.

[nmh] / uip / sendsbr.c

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 7d54f43b49bde66a242edc0b2495b85a803c8edb..c8a16a49a90f62525686e2e2f946fefd5439a290 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -24,9 +24,10 @@
 #ifdef OAUTH_SUPPORT
 #include <h/oauth.h>
 #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 **);
@@ -100,7 +101,7 @@ sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st,
        execvp(buildprogram, buildvec);
        fprintf(stderr, "unable to exec ");
        perror(buildmimeproc);
-       _exit(-1);
+       _exit(1);
        break;
 
     default:
@@ -109,7 +110,7 @@ sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st,
        break;
     }
 
-    done=armed_done;
+    set_done(armed_done);
     switch (setjmp (env)) {
     case OK:
        /*
@@ -119,8 +120,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) {
-               adios(NULL, "unable to create temporary file in %s",
-                     get_temp_dir());
+               adios(NULL, "unable to create temporary file");
            }
            if (rename (drft, strncpy(file, cp, sizeof(file))) == NOTOK)
                adios (file, "unable to rename %s to", drft);
@@ -175,7 +175,7 @@ sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st,
        break;
     }
 
-    done=exit;
+    set_done(exit);
     if (distfile)
        (void) m_unlink (distfile);
 
@@ -198,7 +198,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
     char subject[BUFSIZ];
     char name[NAMESZ], partnum[BUFSIZ];
     FILE *in;
-    m_getfld_state_t gstate = 0;
+    m_getfld_state_t gstate;
 
     if ((in = fopen (drft, "r")) == NULL)
        adios (drft, "unable to open for reading");
@@ -210,10 +210,11 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
      * Scan through the message and examine the various header fields,
      * as well as locate the beginning of the message body.
      */
-    m_getfld_track_filepos (&gstate, in);
+    gstate = m_getfld_state_init(in);
+    m_getfld_track_filepos2(&gstate);
     for (compnum = 1;;) {
        int bufsz = sizeof buffer;
-       switch (state = m_getfld (&gstate, name, buffer, &bufsz, in)) {
+       switch (state = m_getfld2(&gstate, name, buffer, &bufsz)) {
            case FLD:
            case FLDPLUS:
                compnum++;
@@ -224,7 +225,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
                if (!strcasecmp (name, "Message-ID")) {
                    while (state == FLDPLUS) {
                        bufsz = sizeof buffer;
-                       state = m_getfld (&gstate, name, buffer, &bufsz, in);
+                       state = m_getfld2(&gstate, name, buffer, &bufsz);
                    }
                } else if (uprf (name, XXX_FIELD_PRF)
                        || !strcasecmp (name, VRSN_FIELD)
@@ -250,7 +251,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
                    dp = add (concat (name, ":", buffer, NULL), dp);
                    while (state == FLDPLUS) {
                        bufsz = sizeof buffer;
-                       state = m_getfld (&gstate, name, buffer, &bufsz, in);
+                       state = m_getfld2(&gstate, name, buffer, &bufsz);
                        dp = add (buffer, dp);
                    }
                } else {
@@ -261,7 +262,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
                    cp = add (concat (name, ":", buffer, NULL), cp);
                    while (state == FLDPLUS) {
                        bufsz = sizeof buffer;
-                       state = m_getfld (&gstate, name, buffer, &bufsz, in);
+                       state = m_getfld2(&gstate, name, buffer, &bufsz);
                        cp = add (buffer, cp);
                    }
                }
@@ -301,7 +302,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
     /* 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);
@@ -328,8 +329,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
 
        char *cp = m_mktemp2(drft, invo_name, NULL, &out);
         if (cp == NULL) {
-           adios(NULL, "unable to create temporary file in %s",
-                 get_temp_dir());
+           adios(NULL, "unable to create temporary file");
         }
        strncpy(tmpdrf, cp, sizeof(tmpdrf));
 
@@ -407,7 +407,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
     }
 
     free (cp);
-    mh_xfree(dp);
+    free(dp);
 
     fclose (in);       /* close the draft */
     return status;
@@ -423,7 +423,7 @@ static int
 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;
@@ -444,9 +444,7 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st)
        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 */
@@ -468,7 +466,7 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st)
        execvp (program, vec);
        fprintf (stderr, "unable to exec ");
        perror (postproc);
-       _exit (-1);
+       _exit(1);
 
     default:
        /*
@@ -513,14 +511,12 @@ static void
 alert (char *file, int out)
 {
     pid_t child_id;
-    int i, in, argp;
+    int in, argp;
     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 */
@@ -573,7 +569,7 @@ alert (char *file, int out)
            execvp (program, arglist);
            fprintf (stderr, "unable to exec ");
            perror (mailproc);
-           _exit (-1);
+           _exit(1);
 
        default:                /* no waiting... */
            break;
@@ -591,9 +587,8 @@ tmp_fd (void)
 
     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;
 }
@@ -827,7 +822,7 @@ setup_oauth_params(char *vec[], int *vecp, const char *auth_svc,
            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");
@@ -912,7 +907,7 @@ get_message_header_info(FILE *in, char *format) {
     struct format *fmt;
     struct stat st;
     int parsing_header;
-    m_getfld_state_t gstate = 0;
+    m_getfld_state_t gstate;
     charstring_t buffer = charstring_create(0);
     char *retval;
 
@@ -928,10 +923,11 @@ get_message_header_info(FILE *in, char *format) {
      */
     rewind (in);
     parsing_header = 1;
+    gstate = m_getfld_state_init(in);
     do {
         char name[NAMESZ], rbuf[NMH_BUFSIZ];
         int bufsz = sizeof rbuf;
-        int state = m_getfld(&gstate, name, rbuf, &bufsz, in);
+        int state = m_getfld2(&gstate, name, rbuf, &bufsz);
 
         switch (state) {
         case FLD:
@@ -941,14 +937,14 @@ get_message_header_info(FILE *in, char *format) {
             if (bucket != -1) {
                 while (state == FLDPLUS) {
                     bufsz = sizeof rbuf;
-                    state = m_getfld(&gstate, name, rbuf, &bufsz, in);
+                    state = m_getfld2(&gstate, name, rbuf, &bufsz);
                     fmt_appendcomp(bucket, name, rbuf);
                 }
             }
 
             while (state == FLDPLUS) {
                 bufsz = sizeof rbuf;
-                state = m_getfld(&gstate, name, rbuf, &bufsz, in);
+                state = m_getfld2(&gstate, name, rbuf, &bufsz);
             }
             break;
         }