#include <h/mh.h>
#include <h/signals.h>
-#include <h/m_setjmp.h>
-#include <signal.h>
+#include <setjmp.h>
#include <fcntl.h>
#include <h/mime.h>
#include <h/tws.h>
static jmp_buf env;
-static char body_file_name[MAXPATHLEN + 1]; /* name of temporary file for body content */
-static char composition_file_name[MAXPATHLEN + 1]; /* name of mhbuild composition temporary file */
-static int field_size; /* size of header field buffer */
-static char *field; /* header field buffer */
-static FILE *draft_file; /* draft file pointer */
-static FILE *body_file; /* body file pointer */
-static FILE *composition_file; /* composition file pointer */
-
/*
* external prototypes
*/
-int sendsbr (char **, int, char *, struct stat *, int, char *, int);
+int sendsbr (char **, int, char *, char *, struct stat *, int, char *, int);
char *getusername (void);
/*
static int tmp_fd (void);
static void anno (int, struct stat *);
static void annoaux (int);
-static int splitmsg (char **, int, char *, struct stat *, int);
-static int sendaux (char **, int, char *, struct stat *);
-
-static int attach(char *, char *, int);
-static void clean_up_temporary_files(void);
-static int get_line(void);
-static void make_mime_composition_file_entry(char *, int);
+static int splitmsg (char **, int, char *, char *, struct stat *, int);
+static int sendaux (char **, int, char *, char *, struct stat *);
/*
*/
int
-sendsbr (char **vec, int vecp, char *drft, struct stat *st, int rename_drft, char *attachment_header_field_name, int attachformat)
+sendsbr (char **vec, int vecp, char *program, char *drft, struct stat *st,
+ int rename_drft, char *attachment_header_field_name, int attachformat)
{
int status;
char buffer[BUFSIZ], file[BUFSIZ];
struct stat sts;
char *original_draft; /* name of original draft file */
char *p; /* string pointer for building file name */
+ char composition_file_name[PATH_MAX + 1]; /* name of mhbuild composition temporary file */
+ char body_file_name[PATH_MAX + 1]; /* name of temporary file for body content */
/*
* Save the original name of the draft file. The name of the draft file is changed
*/
if (attachment_header_field_name != (char *)0) {
- switch (attach(attachment_header_field_name, drft, attachformat)) {
+ switch (attach(attachment_header_field_name, drft,
+ body_file_name, sizeof body_file_name,
+ composition_file_name, sizeof composition_file_name,
+ attachformat)) {
case OK:
drft = composition_file_name;
break;
}
done=armed_done;
- switch (m_setjmp (env)) {
+ switch (setjmp (env)) {
case OK:
/*
* If given -push and -unique (which is undocumented), then
*/
if (splitsw >= 0 && !distfile && stat (drft, &sts) != NOTOK
&& sts.st_size >= CPERMSG) {
- status = splitmsg (vec, vecp, drft, st, splitsw) ? NOTOK : OK;
+ status = splitmsg (vec, vecp, program, drft, st, splitsw) ? NOTOK : OK;
} else {
- status = sendaux (vec, vecp, drft, st) ? NOTOK : OK;
+ status = sendaux (vec, vecp, program, drft, st) ? NOTOK : OK;
}
/* rename the original draft */
*/
if (drft == composition_file_name) {
- clean_up_temporary_files();
+ clean_up_temporary_files(body_file_name, composition_file_name);
if (strlen(composition_file_name) >= sizeof (composition_file_name) - 6)
advise((char *)0, "unable to remove original composition file.");
return status;
}
-static int
-attach(char *attachment_header_field_name, char *draft_file_name,
- int attachformat)
-{
- char buf[MAXPATHLEN + 6]; /* miscellaneous buffer */
- int c; /* current character for body copy */
- int has_attachment; /* draft has at least one attachment */
- int has_body; /* draft has a message body */
- int length; /* length of attachment header field name */
- char *p; /* miscellaneous string pointer */
-
- /*
- * Open up the draft file.
- */
-
- if ((draft_file = fopen(draft_file_name, "r")) == (FILE *)0)
- adios((char *)0, "can't open draft file `%s'.", draft_file_name);
-
- /*
- * Allocate a buffer to hold the header components as they're read in.
- * This buffer might need to be quite large, so we grow it as needed.
- */
-
- field = (char *)mh_xmalloc(field_size = 256);
-
- /*
- * Scan the draft file for a header field name that matches the -attach
- * argument. The existence of one indicates that the draft has attachments.
- * Bail out if there are no attachments because we're done. Read to the
- * end of the headers even if we have no attachments.
- */
-
- length = strlen(attachment_header_field_name);
-
- has_attachment = 0;
-
- while (get_line() != EOF && *field != '\0' && *field != '-')
- if (strncasecmp(field, attachment_header_field_name, length) == 0 && field[length] == ':')
- has_attachment = 1;
-
- if (has_attachment == 0)
- return (DONE);
-
- /*
- * We have at least one attachment. Look for at least one non-blank line
- * in the body of the message which indicates content in the body.
- */
-
- has_body = 0;
-
- while (get_line() != EOF) {
- for (p = field; *p != '\0'; p++) {
- if (*p != ' ' && *p != '\t') {
- has_body = 1;
- break;
- }
- }
-
- if (has_body)
- break;
- }
-
- /*
- * Make names for the temporary files.
- */
-
- (void)strncpy(body_file_name,
- m_mktemp(m_maildir(invo_name), NULL, NULL),
- sizeof (body_file_name));
- (void)strncpy(composition_file_name,
- m_mktemp(m_maildir(invo_name), NULL, NULL),
- sizeof (composition_file_name));
-
- if (has_body)
- body_file = fopen(body_file_name, "w");
-
- composition_file = fopen(composition_file_name, "w");
-
- if ((has_body && body_file == (FILE *)0) || composition_file == (FILE *)0) {
- clean_up_temporary_files();
- adios((char *)0, "unable to open all of the temporary files.");
- }
-
- /*
- * Start at the beginning of the draft file. Copy all non-attachment header fields
- * to the temporary composition file. Then add the dashed line separator.
- */
-
- rewind(draft_file);
-
- while (get_line() != EOF && *field != '\0' && *field != '-')
- if (strncasecmp(field, attachment_header_field_name, length) != 0 || field[length] != ':')
- (void)fprintf(composition_file, "%s\n", field);
-
- (void)fputs("--------\n", composition_file);
-
- /*
- * Copy the message body to a temporary file.
- */
-
- if (has_body) {
- while ((c = getc(draft_file)) != EOF)
- putc(c, body_file);
-
- (void)fclose(body_file);
- }
-
- /*
- * Add a mhbuild MIME composition file line for the body if there was one.
- */
-
- if (has_body)
- make_mime_composition_file_entry(body_file_name, attachformat);
-
- /*
- * Now, go back to the beginning of the draft file and look for header fields
- * that specify attachments. Add a mhbuild MIME composition file for each.
- */
-
- rewind(draft_file);
-
- while (get_line() != EOF && *field != '\0' && *field != '-') {
- if (strncasecmp(field, attachment_header_field_name, length) == 0 && field[length] == ':') {
- for (p = field + length + 1; *p == ' ' || *p == '\t'; p++)
- ;
-
- make_mime_composition_file_entry(p, attachformat);
- }
- }
-
- (void)fclose(composition_file);
-
- /*
- * We're ready to roll! Run mhbuild on the composition file. Note that mhbuild
- * is in the context as buildmimeproc.
- */
-
- (void)sprintf(buf, "%s %s", buildmimeproc, composition_file_name);
-
- if (system(buf) != 0) {
- clean_up_temporary_files();
- return (NOTOK);
- }
-
- return (OK);
-}
-
-static void
-clean_up_temporary_files(void)
-{
- (void)unlink(body_file_name);
- (void)unlink(composition_file_name);
-
- return;
-}
-
-static int
-get_line(void)
-{
- int c; /* current character */
- int n; /* number of bytes in buffer */
- char *p; /* buffer pointer */
-
- /*
- * Get a line from the input file, growing the field buffer as needed. We do this
- * so that we can fit an entire line in the buffer making it easy to do a string
- * comparison on both the field name and the field body which might be a long path
- * name.
- */
-
- for (n = 0, p = field; (c = getc(draft_file)) != EOF; *p++ = c) {
- if (c == '\n' && (c = getc(draft_file)) != ' ' && c != '\t') {
- (void)ungetc(c, draft_file);
- c = '\n';
- break;
- }
-
- if (++n >= field_size - 1) {
- field = (char *)mh_xrealloc((void *)field, field_size += 256);
-
- p = field + n - 1;
- }
- }
-
- /*
- * NUL-terminate the field..
- */
-
- *p = '\0';
-
- return (c);
-}
-
-static void
-make_mime_composition_file_entry(char *file_name, int attachformat)
-{
- int binary; /* binary character found flag */
- int c; /* current character */
- char cmd[MAXPATHLEN + 6]; /* file command buffer */
- char *content_type; /* mime content type */
- FILE *fp; /* content and pipe file pointer */
- struct node *np; /* context scan node pointer */
- char *p; /* miscellaneous string pointer */
- struct stat st; /* file status buffer */
-
- content_type = (char *)0;
-
- /*
- * Check the file name for a suffix. Scan the context for that suffix on a
- * mhshow-suffix- entry. We use these entries to be compatible with mhnshow,
- * and there's no reason to make the user specify each suffix twice. Context
- * entries of the form "mhshow-suffix-contenttype" in the name have the suffix
- * in the field, including the dot.
- */
-
- if ((p = strrchr(file_name, '.')) != (char *)0) {
- for (np = m_defs; np; np = np->n_next) {
- if (strncasecmp(np->n_name, "mhshow-suffix-", 14) == 0 && mh_strcasecmp(p, np->n_field) == 0) {
- content_type = np->n_name + 14;
- break;
- }
- }
- }
-
- /*
- * No content type was found, either because there was no matching entry in the
- * context or because the file name has no suffix. Open the file and check for
- * non-ASCII characters. Choose the content type based on this check.
- */
-
- if (content_type == (char *)0) {
- if ((fp = fopen(file_name, "r")) == (FILE *)0) {
- clean_up_temporary_files();
- adios((char *)0, "unable to access file \"%s\"", file_name);
- }
-
- binary = 0;
-
- while ((c = getc(fp)) != EOF) {
- if (c > 127 || c < 0) {
- binary = 1;
- break;
- }
- }
-
- (void)fclose(fp);
-
- content_type = binary ? "application/octet-stream" : "text/plain";
- }
-
- /*
- * Make sure that the attachment file exists and is readable. Append a mhbuild
- * directive to the draft file. This starts with the content type. Append a
- * file name attribute and a private x-unix-mode attribute. Also append a
- * description obtained (if possible) by running the "file" command on the file.
- */
-
- if (stat(file_name, &st) == -1 || access(file_name, R_OK) != 0) {
- clean_up_temporary_files();
- adios((char *)0, "unable to access file \"%s\"", file_name);
- }
-
- switch (attachformat) {
- case 0:
- /* Insert name, file mode, and Content-Id. */
- (void)fprintf(composition_file, "#%s; name=\"%s\"; x-unix-mode=0%.3ho",
- content_type, ((p = strrchr(file_name, '/')) == (char *)0) ? file_name : p + 1, (unsigned short)(st.st_mode & 0777));
-
- if (strlen(file_name) > MAXPATHLEN) {
- clean_up_temporary_files();
- adios((char *)0, "attachment file name `%s' too long.", file_name);
- }
-
- (void)sprintf(cmd, "file '%s'", file_name);
-
- if ((fp = popen(cmd, "r")) != (FILE *)0 && fgets(cmd, sizeof (cmd), fp) != (char *)0) {
- *strchr(cmd, '\n') = '\0';
-
- /*
- * The output of the "file" command is of the form
- *
- * file: description
- *
- * Strip off the "file:" and subsequent white space.
- */
-
- for (p = cmd; *p != '\0'; p++) {
- if (*p == ':') {
- for (p++; *p != '\0'; p++) {
- if (*p != '\t')
- break;
- }
- break;
- }
- }
-
- if (*p != '\0')
- /* Insert Content-Description. */
- (void)fprintf(composition_file, " [ %s ]", p);
-
- (void)pclose(fp);
- }
-
- break;
- case 1:
- if (stringdex (m_maildir(invo_name), file_name) == 0) {
- /* Content had been placed by send into a temp file.
- Don't generate Content-Disposition header, because
- it confuses Microsoft Outlook, Build 10.0.6626, at
- least. */
- (void) fprintf (composition_file, "#%s <>", content_type);
- } else {
- /* Suppress Content-Id, insert simple Content-Disposition
- and Content-Description with filename. */
- (void) fprintf (composition_file,
- "#%1$s; name=\"%2$s\" <> [%2$s]{attachment}",
- content_type,
- ((p = strrchr(file_name, '/')) == (char *)0) ? file_name : p + 1);
- }
-
- break;
- case 2:
- if (stringdex (m_maildir(invo_name), file_name) == 0) {
- /* Content had been placed by send into a temp file.
- Don't generate Content-Disposition header, because
- it confuses Microsoft Outlook, Build 10.0.6626, at
- least. */
- (void) fprintf (composition_file, "#%s <>", content_type);
- } else {
- /* Suppress Content-Id, insert Content-Disposition with
- modification date and Content-Description wtih filename. */
- (void) fprintf (composition_file,
- "#%1$s; name=\"%2$s\" <>[%2$s]{attachment; modification-date=\"%3$s\"}",
- content_type,
- ((p = strrchr(file_name, '/')) == (char *)0) ? file_name : p + 1,
- dtime (&st.st_mtime, 0));
- }
-
- break;
- default:
- adios ((char *)0, "unsupported attachformat %d", attachformat);
- }
-
- /*
- * Finish up with the file name.
- */
-
- (void)fprintf(composition_file, " %s\n", file_name);
-
- return;
-}
-
/*
* Split large message into several messages of
* type "message/partial" and send them.
*/
static int
-splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
+splitmsg (char **vec, int vecp, char *program, char *drft,
+ struct stat *st, int delay)
{
int compnum, nparts, partno, state, status;
long pos, start;
char subject[BUFSIZ];
char name[NAMESZ], partnum[BUFSIZ];
FILE *in;
+ m_getfld_state_t gstate = 0;
if ((in = fopen (drft, "r")) == NULL)
adios (drft, "unable to open for reading");
* Scan through the message and examine the various header fields,
* as well as locate the beginning of the message body.
*/
- for (compnum = 1, state = FLD;;) {
- switch (state = m_getfld (state, name, buffer, sizeof(buffer), in)) {
+ m_getfld_track_filepos (&gstate, in);
+ for (compnum = 1;;) {
+ int bufsz = sizeof buffer;
+ switch (state = m_getfld (&gstate, name, buffer, &bufsz, in)) {
case FLD:
case FLDPLUS:
- case FLDEOF:
compnum++;
/*
* This header field is discarded.
*/
- if (!mh_strcasecmp (name, "Message-ID")) {
- while (state == FLDPLUS)
- state = m_getfld (state, name, buffer, sizeof(buffer), in);
+ if (!strcasecmp (name, "Message-ID")) {
+ while (state == FLDPLUS) {
+ bufsz = sizeof buffer;
+ state = m_getfld (&gstate, name, buffer, &bufsz, in);
+ }
} else if (uprf (name, XXX_FIELD_PRF)
- || !mh_strcasecmp (name, VRSN_FIELD)
- || !mh_strcasecmp (name, "Subject")
- || !mh_strcasecmp (name, "Encrypted")) {
+ || !strcasecmp (name, VRSN_FIELD)
+ || !strcasecmp (name, "Subject")
+ || !strcasecmp (name, "Encrypted")) {
/*
* These header fields are copied to the enclosed
* header of the first message in the collection
* version of it, can be copied to the header
* of each messsage/partial in the collection.
*/
- if (!mh_strcasecmp (name, "Subject")) {
+ if (!strcasecmp (name, "Subject")) {
size_t sublen;
strncpy (subject, buffer, BUFSIZ);
dp = add (concat (name, ":", buffer, NULL), dp);
while (state == FLDPLUS) {
- state = m_getfld (state, name, buffer, sizeof(buffer), in);
+ bufsz = sizeof buffer;
+ state = m_getfld (&gstate, name, buffer, &bufsz, in);
dp = add (buffer, dp);
}
} else {
*/
cp = add (concat (name, ":", buffer, NULL), cp);
while (state == FLDPLUS) {
- state = m_getfld (state, name, buffer, sizeof(buffer), in);
+ bufsz = sizeof buffer;
+ state = m_getfld (&gstate, name, buffer, &bufsz, in);
cp = add (buffer, cp);
}
}
- if (state != FLDEOF) {
- start = ftell (in) + 1;
- continue;
- }
- /* else fall... */
+ start = ftell (in) + 1;
+ continue;
case BODY:
- case BODYEOF:
case FILEEOF:
break;
break;
}
+ m_getfld_state_destroy (&gstate);
if (cp == NULL)
adios (NULL, "headers missing from draft");
free (dp);
fclose (in);
- return sendaux (vec, vecp, drft, st);
+ return sendaux (vec, vecp, program, drft, st);
}
if (!pushsw) {
vec[vecp++] = "-queued";
time (&clock);
- snprintf (msgid, sizeof(msgid), "<%d.%ld@%s>",
- (int) getpid(), (long) clock, LocalName());
+ snprintf (msgid, sizeof(msgid), "%s", message_id (clock, 0));
fseek (in, start, SEEK_SET);
for (partno = 1; partno <= nparts; partno++) {
}
snprintf (partnum, sizeof(partnum), "%d", partno);
- status = sendaux (vec, vecp, tmpdrf, st);
+ status = sendaux (vec, vecp, program, tmpdrf, st);
unlink (tmpdrf);
if (status != OK)
break;
/*
* Annotate original message, and
- * call `postproc' to send message.
+ * call `postproc' (which is passed down in "program") to send message.
*/
static int
-sendaux (char **vec, int vecp, char *drft, struct stat *st)
+sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st)
{
pid_t child_id;
int i, status, fd, fd2;
done (1);
vec[vecp] = NULL;
- for (i = 0; (child_id = m_vfork()) == NOTOK && i < 5; i++)
+ for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
sleep (5);
switch (child_id) {
dup2 (fd, fileno (stderr));
close (fd);
}
- execvp (postproc, vec);
+ execvp (program, vec);
fprintf (stderr, "unable to exec ");
perror (postproc);
_exit (-1);
- break; /* NOT REACHED */
default:
/*
alert (char *file, int out)
{
pid_t child_id;
- int i, in;
+ int i, in, argp;
char buf[BUFSIZ];
+ char *program;
+ char **arglist;
for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
sleep (5);
snprintf (buf, sizeof(buf), "send failed on %s",
forwsw ? "enclosed draft" : file);
- execlp (mailproc, r1bindex (mailproc, '/'), getusername (),
- "-subject", buf, NULL);
+ arglist = argsplit(mailproc, &program, &argp);
+
+ arglist[argp++] = getusername();
+ arglist[argp++] = "-subject";
+ arglist[argp++] = buf;
+ arglist[argp] = NULL;
+
+ execvp (program, arglist);
fprintf (stderr, "unable to exec ");
perror (mailproc);
_exit (-1);
admonish (maildir, "unable to change directory to");
return;
}
- if (!(mp = folder_read (folder))) {
+ if (!(mp = folder_read (folder, 0))) {
if (debugsw)
admonish (NULL, "unable to read folder %s", folder);
return;
armed_done (int status)
{
longjmp (env, status ? status : NOTOK);
-
- exit (status);
}
projects / nmh / blobdiff