-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 */
+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 */
- 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 */
-
- /*
- * Save the original name of the draft file. The name of the draft file is changed
- * to a temporary file containing the built MIME message if there are attachments.
- * We need the original name so that it can be renamed after the message is sent.
- */
-
- original_draft = drft;
-
- /*
- * There might be attachments if a header field name for attachments is supplied.
- * Convert the draft to a MIME message. Use the mhbuild composition file for the
- * draft if there was a successful conversion because that now contains the MIME
- * message. A nice side effect of this is that it leaves the original draft file
- * untouched so that it can be retrieved and modified if desired.
- */
-
- if (attachment_header_field_name != (char *)0) {
- switch (attach(attachment_header_field_name, drft)) {
- case OK:
- drft = composition_file_name;
- break;
-
- case NOTOK:
- return (NOTOK);
-
- case DONE:
- break;
- }
- }
+ int status;
+ char buffer[BUFSIZ], file[BUFSIZ];
+ char *original_draft; /* name of original draft file */
+ char *p; /* string pointer for building file name */
- /* rename the original draft */
- if (rename_drft && status == OK &&
- rename (original_draft, strncpy (buffer, m_backup (original_draft), sizeof(buffer))) == NOTOK)
- advise (buffer, "unable to rename %s to", drft);
- break;
-
- default:
- status = DONE;
- break;
- }
-
- armed = 0;
- if (distfile)
- unlink (distfile);
-
- /*
- * Get rid of any temporary files that we created for attachments. Also get rid of
- * the renamed composition file that mhbuild leaves as a turd. It looks confusing,
- * but we use the body file name to help build the renamed composition file name.
- */
-
- if (drft == composition_file_name) {
- clean_up_temporary_files();
-
- if (strlen(composition_file_name) >= sizeof (composition_file_name) - 6)
- advise((char *)0, "unable to remove original composition file.");
-
- else {
- if ((p = strrchr(composition_file_name, '/')) == (char *)0)
- p = composition_file_name;
- else
- p++;
-
- (void)strcpy(body_file_name, p);
- *p++ = ',';
- (void)strcpy(p, body_file_name);
- (void)strcat(p, ".orig");
-
- (void)unlink(composition_file_name);
- }
- }
-
- return status;
-}
+ if (attachment_header_field_name != (char *)0) {
+ switch (attach(attachment_header_field_name, drft, attachformat)) {
+ case OK:
+ drft = composition_file_name;
+ break;
- if ((draft_file = fopen(draft_file_name, "r")) == (FILE *)0)
- adios((char *)0, "can't open draft file `%s'.", draft_file_name);
+ done=armed_done;
+ switch (setjmp (env)) {
+ case OK:
+ /*
+ * If given -push and -unique (which is undocumented), then
+ * rename the draft file. I'm not quite sure why.
+ */
+ if (pushsw && unique) {
+ char *cp = m_mktemp2(drft, invo_name, NULL, NULL);
+ if (cp == NULL) {
+ adios ("sendsbr", "unable to create temporary file");
+ }
+ if (rename (drft, strncpy(file, cp, sizeof(file))) == NOTOK)
+ adios (file, "unable to rename %s to", drft);
+ drft = file;
+ }
-static void
-make_mime_composition_file_entry(char *file_name)
-{
- 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 && 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);
- }
- int compnum, nparts, partno, state, status;
- long pos, start;
- time_t clock;
- char *cp, *dp, buffer[BUFSIZ], msgid[BUFSIZ];
- char subject[BUFSIZ];
- char name[NAMESZ], partnum[BUFSIZ];
- FILE *in;
-
- if ((in = fopen (drft, "r")) == NULL)
- adios (drft, "unable to open for reading");
-
- cp = dp = NULL;
- start = 0L;
-
- /*
- * 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)) {
- case FLD:
- case FLDPLUS:
- case FLDEOF:
- compnum++;
+ 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 */
- /*
- * This header field is discarded.
- */
- if (!strcasecmp (name, "Message-ID")) {
- while (state == FLDPLUS)
- state = m_getfld (state, name, buffer, sizeof(buffer), in);
- } else if (uprf (name, XXX_FIELD_PRF)
- || !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
- * of message/partials. For the "Subject" header
- * field, we also record it, so that a modified
- * version of it, can be copied to the header
- * of each messsage/partial in the collection.
- */
- if (!strcasecmp (name, "Subject")) {
- size_t sublen;
-
- strncpy (subject, buffer, BUFSIZ);
- sublen = strlen (subject);
- if (sublen > 0 && subject[sublen - 1] == '\n')
- subject[sublen - 1] = '\0';
- }
-
- dp = add (concat (name, ":", buffer, NULL), dp);
- while (state == FLDPLUS) {
- state = m_getfld (state, name, buffer, sizeof(buffer), in);
- dp = add (buffer, dp);
- }
- } else {
- /*
- * These header fields are copied to the header of
- * each message/partial in the collection.
- */
- cp = add (concat (name, ":", buffer, NULL), cp);
- while (state == FLDPLUS) {
- state = m_getfld (state, name, buffer, sizeof(buffer), in);
- cp = add (buffer, cp);
- }
- }
+ 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 mhshow, 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.
+ */
- }
-
- /* Only one part, nothing to split */
- if (nparts == 1) {
- free (cp);
- if (dp)
- free (dp);
-
- fclose (in);
- return sendaux (vec, vecp, drft, st);
- }
-
- if (!pushsw) {
- printf ("Sending as %d Partial Messages\n", nparts);
- fflush (stdout);
- }
- status = OK;
-
- vec[vecp++] = "-partno";
- vec[vecp++] = partnum;
- if (delay == 0)
- vec[vecp++] = "-queued";
-
- time (&clock);
- snprintf (msgid, sizeof(msgid), "<%d.%ld@%s>",
- (int) getpid(), (long) clock, LocalName());
-
- fseek (in, start, SEEK_SET);
- for (partno = 1; partno <= nparts; partno++) {
- char tmpdrf[BUFSIZ];
- FILE *out;
-
- strncpy (tmpdrf, m_scratch (drft, invo_name), sizeof(tmpdrf));
- if ((out = fopen (tmpdrf, "w")) == NULL)
- adios (tmpdrf, "unable to open for writing");
- chmod (tmpdrf, 0600);
- if (!pushsw && verbsw) {
- printf ("\n");
- fflush (stdout);
- }
+ 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.
+ */
+ (void) fprintf (composition_file,
+ "#%s; name=\"%s\" <>{attachment; modification-date=\"%s\"}",
+ content_type,
+ ((p = strrchr(file_name, '/')) == (char *)0) ?
+ file_name : p + 1, dtime (&st.st_mtime, 0));
+ }
- pid_t child_id;
- int i, status, fd, fd2;
- char backup[BUFSIZ], buf[BUFSIZ];
-
- fd = pushsw ? tmp_fd () : NOTOK;
- fd2 = NOTOK;
-
- vec[vecp++] = drft;
- if (annotext) {
- if ((fd2 = tmp_fd ()) != NOTOK) {
- vec[vecp++] = "-idanno";
- snprintf (buf, sizeof(buf), "%d", fd2);
- vec[vecp++] = buf;
- } else {
- admonish (NULL, "unable to create file for annotation list");
+ pid_t child_id;
+ int i, status, fd, fd2;
+ char backup[BUFSIZ], buf[BUFSIZ];
+
+ fd = pushsw ? tmp_fd () : NOTOK;
+ fd2 = NOTOK;
+
+ vec[vecp++] = drft;
+ if (annotext) {
+ if ((fd2 = tmp_fd ()) != NOTOK) {
+ vec[vecp++] = "-idanno";
+ snprintf (buf, sizeof(buf), "%d", fd2);
+ vec[vecp++] = buf;
+ } else {
+ admonish (NULL, "unable to create file for annotation list");
+ }
- case 0:
- /*
- * child process -- send it
- *
- * If fd is ok, then we are pushing and fd points to temp
- * file, so capture anything on stdout and stderr there.
- */
- if (fd != NOTOK) {
- dup2 (fd, fileno (stdout));
- dup2 (fd, fileno (stderr));
- close (fd);
- }
- execvp (postproc, vec);
- fprintf (stderr, "unable to exec ");
- perror (postproc);
- _exit (-1);
- break; /* NOT REACHED */
+ case 0:
+ /*
+ * child process -- send it
+ *
+ * If fd is ok, then we are pushing and fd points to temp
+ * file, so capture anything on stdout and stderr there.
+ */
+ if (fd != NOTOK) {
+ dup2 (fd, fileno (stdout));
+ dup2 (fd, fileno (stderr));
+ close (fd);
+ }
+ execvp (postproc, vec);
+ fprintf (stderr, "unable to exec ");
+ perror (postproc);
+ _exit (-1);
+ break; /* NOT REACHED */
- default:
- /*
- * parent process -- wait for it
- */
- if ((status = pidwait(child_id, NOTOK)) == OK) {
- if (annotext && fd2 != NOTOK)
- anno (fd2, st);
- } else {
- /*
- * If postproc failed, and we have good fd (which means
- * we pushed), then mail error message (and possibly the
- * draft) back to the user.
- */
- if (fd != NOTOK) {
- alert (drft, fd);
- close (fd);
- } else {
- advise (NULL, "message not delivered to anyone");
- }
- if (annotext && fd2 != NOTOK)
- close (fd2);
- if (distfile) {
- unlink (drft);
- if (rename (backup, drft) == NOTOK)
- advise (drft, "unable to rename %s to", backup);
- }
+ default:
+ /*
+ * parent process -- wait for it
+ */
+ if ((status = pidwait(child_id, NOTOK)) == OK) {
+ if (annotext && fd2 != NOTOK)
+ anno (fd2, st);
+ } else {
+ /*
+ * If postproc failed, and we have good fd (which means
+ * we pushed), then mail error message (and possibly the
+ * draft) back to the user.
+ */
+ if (fd != NOTOK) {
+ alert (drft, fd);
+ close (fd);
+ } else {
+ advise (NULL, "message not delivered to anyone");
+ }
+ if (annotext && fd2 != NOTOK)
+ close (fd2);
+ if (distfile) {
+ unlink (drft);
+ if (rename (backup, drft) == NOTOK)
+ advise (drft, "unable to rename %s to", backup);
+ }
+ }
+ break;
- pid_t child_id;
- int i, in;
- char buf[BUFSIZ];
-
- for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
- sleep (5);
-
- switch (child_id) {
- case NOTOK:
- /* oops -- fork error */
- advise ("fork", "unable to");
-
- case OK:
- /* child process -- send it */
- SIGNAL (SIGHUP, SIG_IGN);
- SIGNAL (SIGINT, SIG_IGN);
- SIGNAL (SIGQUIT, SIG_IGN);
- SIGNAL (SIGTERM, SIG_IGN);
- if (forwsw) {
- if ((in = open (file, O_RDONLY)) == NOTOK) {
- admonish (file, "unable to re-open");
- } else {
- lseek (out, (off_t) 0, SEEK_END);
- strncpy (buf, "\nMessage not delivered to anyone.\n", sizeof(buf));
- write (out, buf, strlen (buf));
- strncpy (buf, "\n------- Unsent Draft\n\n", sizeof(buf));
- write (out, buf, strlen (buf));
- cpydgst (in, out, file, "temporary file");
- close (in);
- strncpy (buf, "\n------- End of Unsent Draft\n", sizeof(buf));
- write (out, buf, strlen (buf));
- if (rename (file, strncpy (buf, m_backup (file), sizeof(buf))) == NOTOK)
- admonish (buf, "unable to rename %s to", file);
- }
- }
- lseek (out, (off_t) 0, SEEK_SET);
- dup2 (out, fileno (stdin));
- close (out);
- /* create subject for error notification */
- snprintf (buf, sizeof(buf), "send failed on %s",
- forwsw ? "enclosed draft" : file);
-
- execlp (mailproc, r1bindex (mailproc, '/'), getusername (),
- "-subject", buf, NULL);
- fprintf (stderr, "unable to exec ");
- perror (mailproc);
- _exit (-1);
-
- default: /* no waiting... */
- break;
- }
+ pid_t child_id;
+ int i, in;
+ char buf[BUFSIZ];
+
+ for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
+ sleep (5);
+
+ switch (child_id) {
+ case NOTOK:
+ /* oops -- fork error */
+ advise ("fork", "unable to");
+
+ case OK:
+ /* child process -- send it */
+ SIGNAL (SIGHUP, SIG_IGN);
+ SIGNAL (SIGINT, SIG_IGN);
+ SIGNAL (SIGQUIT, SIG_IGN);
+ SIGNAL (SIGTERM, SIG_IGN);
+ if (forwsw) {
+ if ((in = open (file, O_RDONLY)) == NOTOK) {
+ admonish (file, "unable to re-open");
+ } else {
+ lseek (out, (off_t) 0, SEEK_END);
+ strncpy (buf, "\nMessage not delivered to anyone.\n", sizeof(buf));
+ write (out, buf, strlen (buf));
+ strncpy (buf, "\n------- Unsent Draft\n\n", sizeof(buf));
+ write (out, buf, strlen (buf));
+ cpydgst (in, out, file, "temporary file");
+ close (in);
+ strncpy (buf, "\n------- End of Unsent Draft\n", sizeof(buf));
+ write (out, buf, strlen (buf));
+ if (rename (file, strncpy (buf, m_backup (file), sizeof(buf))) == NOTOK)
+ admonish (buf, "unable to rename %s to", file);
+ }
+ }
+ lseek (out, (off_t) 0, SEEK_SET);
+ dup2 (out, fileno (stdin));
+ close (out);
+ /* create subject for error notification */
+ snprintf (buf, sizeof(buf), "send failed on %s",
+ forwsw ? "enclosed draft" : file);
+
+ execlp (mailproc, r1bindex (mailproc, '/'), getusername (),
+ "-subject", buf, NULL);
+ fprintf (stderr, "unable to exec ");
+ perror (mailproc);
+ _exit (-1);
+
+ default: /* no waiting... */
+ break;
+ }
- int fd;
- char tmpfil[BUFSIZ];
-
- strncpy (tmpfil, m_tmpfil (invo_name), sizeof(tmpfil));
- if ((fd = open (tmpfil, O_RDWR | O_CREAT | O_TRUNC, 0600)) == NOTOK)
- return NOTOK;
- if (debugsw)
- advise (NULL, "temporary file %s selected", tmpfil);
- else
- if (unlink (tmpfil) == NOTOK)
- advise (tmpfil, "unable to remove");
-
- return fd;
+ int fd;
+ char *tfile = NULL;
+
+ tfile = m_mktemp2(NULL, invo_name, &fd, NULL);
+ if (tfile == NULL) return NOTOK;
+ fchmod(fd, 0600);
+
+ if (debugsw)
+ advise (NULL, "temporary file %s selected", tfile);
+ else
+ if (unlink (tfile) == NOTOK)
+ advise (tfile, "unable to remove");
+
+ return fd;
- pid_t child_id;
- sigset_t set, oset;
- static char *cwd = NULL;
- struct stat st2;
-
- if (altmsg &&
- (stat (altmsg, &st2) == NOTOK
- || st->st_mtime != st2.st_mtime
- || st->st_dev != st2.st_dev
- || st->st_ino != st2.st_ino)) {
- if (debugsw)
- admonish (NULL, "$mhaltmsg mismatch");
- return;
- }
-
- child_id = debugsw ? NOTOK : fork ();
- switch (child_id) {
- case NOTOK: /* oops */
- if (!debugsw)
- advise (NULL,
- "unable to fork, so doing annotations by hand...");
- if (cwd == NULL)
- cwd = getcpy (pwd ());
-
- case OK:
- /* block a few signals */
- sigemptyset (&set);
- sigaddset (&set, SIGHUP);
- sigaddset (&set, SIGINT);
- sigaddset (&set, SIGQUIT);
- sigaddset (&set, SIGTERM);
- SIGPROCMASK (SIG_BLOCK, &set, &oset);
-
- annoaux (fd);
- if (child_id == OK)
- _exit (0);
-
- /* reset the signal mask */
- SIGPROCMASK (SIG_SETMASK, &oset, &set);
-
- chdir (cwd);
- break;
-
- default: /* no waiting... */
- close (fd);
- break;
- }
+ pid_t child_id;
+ sigset_t set, oset;
+ static char *cwd = NULL;
+ struct stat st2;
+
+ if (altmsg &&
+ (stat (altmsg, &st2) == NOTOK
+ || st->st_mtime != st2.st_mtime
+ || st->st_dev != st2.st_dev
+ || st->st_ino != st2.st_ino)) {
+ if (debugsw)
+ admonish (NULL, "$mhaltmsg mismatch");
+ return;
+ }
+
+ child_id = debugsw ? NOTOK : fork ();
+ switch (child_id) {
+ case NOTOK: /* oops */
+ if (!debugsw)
+ advise (NULL,
+ "unable to fork, so doing annotations by hand...");
+ if (cwd == NULL)
+ cwd = getcpy (pwd ());
+
+ case OK:
+ /* block a few signals */
+ sigemptyset (&set);
+ sigaddset (&set, SIGHUP);
+ sigaddset (&set, SIGINT);
+ sigaddset (&set, SIGQUIT);
+ sigaddset (&set, SIGTERM);
+ SIGPROCMASK (SIG_BLOCK, &set, &oset);
+
+ annoaux (fd);
+ if (child_id == OK)
+ _exit (0);
+
+ /* reset the signal mask */
+ SIGPROCMASK (SIG_SETMASK, &oset, &set);
+
+ chdir (cwd);
+ break;
+
+ default: /* no waiting... */
+ close (fd);
+ break;
+ }
- if ((cp = getenv ("mhmessages")) == NULL || *cp == 0) {
- if (debugsw)
- admonish (NULL, "$mhmessages not set");
- goto oops;
- }
- if (!debugsw /* MOBY HACK... */
- && pushsw
- && (fd3 = open ("/dev/null", O_RDWR)) != NOTOK
- && (fd2 = dup (fileno (stderr))) != NOTOK) {
- dup2 (fd3, fileno (stderr));
- close (fd3);
- }
- else
- fd2 = NOTOK;
- for (ap = brkstring (cp = getcpy (cp), " ", NULL); *ap; ap++)
- m_convert (mp, *ap);
- free (cp);
- if (fd2 != NOTOK)
- dup2 (fd2, fileno (stderr));
- if (mp->numsel == 0) {
- if (debugsw)
- admonish (NULL, "no messages to annotate");
- goto oops;
- }
+ lseek (fd, (off_t) 0, SEEK_SET);
+ if ((fp = fdopen (fd, "r")) == NULL) {
+ if (debugsw)
+ admonish (NULL, "unable to fdopen annotation list");
+ goto oops;
+ }
+ cp = NULL;
+ while (fgets (buffer, sizeof(buffer), fp) != NULL)
+ cp = add (buffer, cp);
+ fclose (fp);
- admonish (NULL, "unable to fdopen annotation list");
- goto oops;
- }
- cp = NULL;
- while (fgets (buffer, sizeof(buffer), fp) != NULL)
- cp = add (buffer, cp);
- fclose (fp);
-
- if (debugsw)
- advise (NULL, "annotate%s with %s: \"%s\"",
- inplace ? " inplace" : "", annotext, cp);
- for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
- if (is_selected(mp, msgnum)) {
- if (debugsw)
- advise (NULL, "annotate message %d", msgnum);
- annotate (m_name (msgnum), annotext, cp, inplace, 1, -2, 0);
+ advise (NULL, "annotate%s with %s: \"%s\"",
+ inplace ? " inplace" : "", annotext, cp);
+ for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
+ if (is_selected(mp, msgnum)) {
+ if (debugsw)
+ advise (NULL, "annotate message %d", msgnum);
+ annotate (m_name (msgnum), annotext, cp, inplace, 1, -2, 0);
+ }