X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/0509728c8a506f287fa3483d8e8ffaf8fb66d41d..0b7286788a95dd854d1826b8493eda431d8e8aac:/uip/sendsbr.c diff --git a/uip/sendsbr.c b/uip/sendsbr.c index 4ba55788..ab4f73ce 100644 --- a/uip/sendsbr.c +++ b/uip/sendsbr.c @@ -5,16 +5,23 @@ * complete copyright information. */ -#include -#include -#include -#include +#include "h/mh.h" +#include "sbr/folder_read.h" +#include "sbr/folder_free.h" +#include "sbr/context_find.h" +#include "sbr/brkstring.h" +#include "sbr/pidstatus.h" +#include "sbr/arglist.h" +#include "sbr/error.h" +#include "h/fmt_scan.h" +#include "h/fmt_compile.h" +#include "h/signals.h" #include #include -#include -#include -#include -#include +#include "h/mime.h" +#include "h/tws.h" +#include "h/utils.h" +#include "h/mts.h" #ifdef HAVE_SYS_TIME_H # include @@ -22,22 +29,24 @@ #include #ifdef OAUTH_SUPPORT -#include +#include "h/oauth.h" #endif -#include "../sbr/m_maildir.h" -#include "../sbr/m_mktemp.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 */ -int forwsw = 1; +bool forwsw = true; int inplace = 1; -int pushsw = 0; +bool pushsw; int splitsw = -1; -int unique = 0; -int verbsw = 0; +bool unique; +bool verbsw; char *altmsg = NULL; /* .. */ char *annotext = NULL; @@ -99,7 +108,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: @@ -108,7 +117,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: /* @@ -118,8 +127,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()); + die("unable to create temporary file"); } if (rename (drft, strncpy(file, cp, sizeof(file))) == NOTOK) adios (file, "unable to rename %s to", drft); @@ -134,10 +142,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) { - adios(NULL, errmsg); + die("%s", errmsg); } #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 */ } @@ -174,7 +182,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); @@ -197,7 +205,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"); @@ -209,10 +217,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++; @@ -223,7 +232,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) @@ -249,7 +258,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 { @@ -260,7 +269,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); } } @@ -274,17 +283,17 @@ splitmsg (char **vec, int vecp, char *program, char *drft, case LENERR: case FMTERR: - adios (NULL, "message format error in component #%d", compnum); + die("message format error in component #%d", compnum); default: - adios (NULL, "getfld () returned %d", state); + die("getfld () returned %d", state); } break; } m_getfld_state_destroy (&gstate); if (cp == NULL) - adios (NULL, "headers missing from draft"); + die("headers missing from draft"); nparts = 1; pos = start; @@ -300,7 +309,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); @@ -327,8 +336,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()); + die("unable to create temporary file"); } strncpy(tmpdrf, cp, sizeof(tmpdrf)); @@ -361,7 +369,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft, if (!fgets (buffer, sizeof buffer, in)) { if (partno == nparts) break; - adios (NULL, "premature eof"); + die("premature eof"); } if ((pos += (len = strlen (buffer))) > CPERMSG) { @@ -406,7 +414,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft, } free (cp); - mh_xfree(dp); + free(dp); fclose (in); /* close the draft */ return status; @@ -422,7 +430,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; @@ -443,9 +451,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 */ @@ -467,7 +473,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: /* @@ -512,14 +518,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 */ @@ -536,7 +540,7 @@ alert (char *file, int out) if ((in = open (file, O_RDONLY)) == NOTOK) { admonish (file, "unable to re-open"); } else { - lseek (out, (off_t) 0, SEEK_END); + lseek(out, 0, SEEK_END); strncpy (buf, "\nMessage not delivered to anyone.\n", sizeof(buf)); if (write (out, buf, strlen (buf)) < 0) { advise (file, "write"); @@ -555,7 +559,7 @@ alert (char *file, int out) admonish (buf, "unable to rename %s to", file); } } - lseek (out, (off_t) 0, SEEK_SET); + lseek(out, 0, SEEK_SET); dup2 (out, fileno (stdin)); close (out); /* create subject for error notification */ @@ -572,7 +576,7 @@ alert (char *file, int out) execvp (program, arglist); fprintf (stderr, "unable to exec "); perror (mailproc); - _exit (-1); + _exit(1); default: /* no waiting... */ break; @@ -590,9 +594,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; } @@ -713,7 +716,7 @@ annoaux (int fd) goto oops; } - lseek (fd, (off_t) 0, SEEK_SET); + lseek(fd, 0, SEEK_SET); if ((fp = fdopen (fd, "r")) == NULL) { if (debugsw) inform("unable to fdopen annotation list, continuing..."); @@ -742,15 +745,15 @@ 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; /* Extract address and host from From: header line in draft. */ if (get_from_header_info(draft, &addr, &host, &message) != OK) { - adios(draft, message); + adios(draft, "%s", message); } /* Merge in any address or host specific switches to post(1) from profile. */ @@ -767,12 +770,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) { - adios(NULL, message); + die("%s", message); } 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 */ } @@ -787,7 +790,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, - const char **message) { + const char **message) +{ const char *saslmech = NULL, *user = NULL; mh_oauth_service_info svc; char errbuf[256]; @@ -820,13 +824,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))) - 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"); - 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"); @@ -850,9 +854,9 @@ setup_oauth_params(char *vec[], int *vecp, const char *auth_svc, /* * 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; @@ -886,8 +890,7 @@ get_from_header_info(const char *filename, const char **addr, const char **host, /* Use the hostformat that corresponds to the successful addrformat. */ if ((*host = get_message_header_info(in, hostformat)) == NULL) { - fclose(in); - *message = "unable to find sender host in"; + *message = "unable to find sender host"; fclose(in); return NOTOK; } @@ -905,14 +908,14 @@ 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. */ -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 parsing_header; - m_getfld_state_t gstate = 0; + bool parsing_header; + m_getfld_state_t gstate; charstring_t buffer = charstring_create(0); char *retval; @@ -927,11 +930,12 @@ get_message_header_info(FILE *in, char *format) { * 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]; 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,19 +945,19 @@ 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; } default: - parsing_header = 0; + parsing_header = false; } } while (parsing_header); m_getfld_state_destroy(&gstate); @@ -982,9 +986,9 @@ get_message_header_info(FILE *in, char *format) { * If no -server passed in from profile or commandline, could use smtp..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);