-
/*
- * sendsbr.c -- routines to help WhatNow/Send along
- *
- * $Id$
- */
+** sendsbr.c -- routines to help WhatNow/Send along
+**
+** This code is Copyright (c) 2002, by the authors of nmh. See the
+** COPYRIGHT file in the root directory of the nmh distribution for
+** complete copyright information.
+*/
#include <h/mh.h>
#include <h/signals.h>
#include <signal.h>
#include <fcntl.h>
#include <h/mime.h>
-
-int debugsw = 0; /* global */
+#include <h/tws.h>
+#include <h/utils.h>
+
+#ifdef TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# ifdef TM_IN_SYS_TIME
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
+int debugsw = 0; /* global */
int forwsw = 1;
int inplace = 1;
int pushsw = 0;
-int splitsw = -1;
-int unique = 0;
int verbsw = 0;
-char *altmsg = NULL; /* .. */
+char *altmsg = NULL; /* .. */
char *annotext = NULL;
char *distfile = NULL;
-static int armed = 0;
static jmp_buf env;
+/* name of temp file for body content */
+static char body_file_name[MAXPATHLEN + 1];
+/* name of mhbuild composition temporary file */
+static char composition_file_name[MAXPATHLEN + 1];
+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);
-void done (int);
-char *getusername (void);
+** external prototypes
+*/
+int sendsbr(char **, int, char *, struct stat *, int);
+char *getusername(void);
/*
- * static prototypes
- */
-static void alert (char *, int);
-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 prototypes
+*/
+static void armed_done(int) NORETURN;
+static void alert(char *, int);
+static int tmp_fd(void);
+static void anno(int, struct stat *);
+static void annoaux(int);
+static int sendaux(char **, int, char *, struct stat *);
+
+static int attach(char *);
+static void clean_up_temporary_files(void);
+static int get_line(void);
+static void make_mime_composition_file_entry(char *);
/*
- * Entry point into (back-end) routines to send message.
- */
+** Entry point into (back-end) routines to send message.
+*/
int
-sendsbr (char **vec, int vecp, char *drft, struct stat *st, int rename_drft)
+sendsbr(char **vec, int vecp, char *drft, struct stat *st, int rename_drft)
{
- int status;
- char buffer[BUFSIZ], file[BUFSIZ];
- struct stat sts;
+ int status;
+ char buffer[BUFSIZ];
+ char *original_draft; /* name of original draft file */
+ char *p; /* string pointer for building file name */
- armed++;
- 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) {
- if (rename (drft, strncpy (file, m_scratch (drft, invo_name), sizeof(file)))
- == NOTOK)
- adios (file, "unable to rename %s to", drft);
- drft = file;
- }
+ ** 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;
/*
- * Check if we need to split the message into
- * multiple messages of type "message/partial".
- */
- if (splitsw >= 0 && !distfile && stat (drft, &sts) != NOTOK
- && sts.st_size >= CPERMSG) {
- status = splitmsg (vec, vecp, drft, st, splitsw) ? NOTOK : OK;
- } else {
- status = sendaux (vec, vecp, drft, st) ? NOTOK : OK;
- }
+ ** 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.
+ */
+ switch (attach(drft)) {
+ case OK:
+ drft = composition_file_name;
+ break;
- /* rename the original draft */
- if (rename_drft && status == OK &&
- rename (drft, strncpy (buffer, m_backup (drft), sizeof(buffer))) == NOTOK)
- advise (buffer, "unable to rename %s to", drft);
- break;
+ case NOTOK:
+ return (NOTOK);
- default:
- status = DONE;
- break;
- }
+ case DONE:
+ break;
+ }
- armed = 0;
- if (distfile)
- unlink (distfile);
+ done=armed_done;
+ switch (setjmp(env)) {
+ case OK:
+ status = sendaux(vec, vecp, drft, st) ? NOTOK : OK;
+ /* 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;
- return status;
-}
+ default:
+ status = DONE;
+ break;
+ }
+ done=exit;
+ if (distfile)
+ unlink(distfile);
-/*
- * Split large message into several messages of
- * type "message/partial" and send them.
- */
+ /*
+ ** 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(NULL, "unable to remove original composition file.");
+
+ else {
+ if ((p = strrchr(composition_file_name, '/')) == NULL)
+ p = composition_file_name;
+ else
+ p++;
+
+ strcpy(body_file_name, p);
+ *p++ = ',';
+ strcpy(p, body_file_name);
+ strcat(p, ".orig");
+
+ unlink(composition_file_name);
+ }
+ }
+
+ return status;
+}
static int
-splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
+attach(char *draft_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++;
+ 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 non_ascii; /* msg body contains non-ASCII chars */
+ 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(NULL, "can't open draft file `%s'.",
+ draft_file_name);
- /*
- * 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);
- }
+ /*
+ ** 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 an attachment header field name.
+ ** 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(attach_hdr);
+
+ has_attachment = 0;
+
+ while (get_line() != EOF && *field != '\0' && *field != '-') {
+ if (strncasecmp(field, attach_hdr, length) == 0 &&
+ field[length] == ':') {
+ has_attachment = 1;
}
+ }
- if (state != FLDEOF) {
- start = ftell (in) + 1;
- continue;
+ /*
+ ** Look for at least one non-blank line in the body of the
+ ** message which indicates content in the body.
+ ** Check if body contains at least one non-blank (= not empty)
+ ** and if it contains any non-ASCII chars (= need MIME).
+ */
+ has_body = 0;
+ non_ascii = 0;
+
+ while (get_line() != EOF) {
+ for (p = field; *p != '\0'; p++) {
+ if (*p != ' ' && *p != '\t') {
+ has_body = 1;
+ }
+ if (*p > 127 || *p < 0) {
+ non_ascii = 1;
+ }
}
- /* else fall... */
+ if (has_body && non_ascii)
+ break;
+ }
- case BODY:
- case BODYEOF:
- case FILEEOF:
- break;
+ /*
+ ** Bail out if there are no attachments and only ASCII text.
+ ** This means we don't need to convert it to MIME.
+ */
+ if (!has_attachment && non_ascii==0) {
+ return DONE;
+ }
+
+ /*
+ ** Else: mimify
+ */
+
+ /* Make names for the temporary files. */
+ strncpy(body_file_name,
+ m_mktemp(toabsdir(invo_name), NULL, NULL),
+ sizeof (body_file_name));
+ strncpy(composition_file_name,
+ m_mktemp(toabsdir(invo_name), NULL, NULL),
+ sizeof (composition_file_name));
- case LENERR:
- case FMTERR:
- adios (NULL, "message format error in component #%d", compnum);
+ if (has_body)
+ body_file = fopen(body_file_name, "w");
- default:
- adios (NULL, "getfld () returned %d", state);
+ composition_file = fopen(composition_file_name, "w");
+
+ if ((has_body && !body_file) || !composition_file) {
+ clean_up_temporary_files();
+ adios(NULL, "unable to open all of the temporary files.");
}
- break;
- }
- if (cp == NULL)
- adios (NULL, "headers missing from draft");
+ /*
+ ** 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 && *field != '-') {
+ if (strncasecmp(field, attach_hdr, length) != 0 ||
+ field[length] != ':') {
+ fprintf(composition_file, "%s\n", field);
+ }
+ }
+ fputs("--------\n", composition_file);
- nparts = 1;
- pos = start;
- while (fgets (buffer, sizeof(buffer) - 1, in)) {
- long len;
+ if (has_body) {
+ /* Copy the message body to the temporary file. */
+ while ((c = getc(draft_file)) != EOF) {
+ putc(c, body_file);
+ }
+ fclose(body_file);
- if ((pos += (len = strlen (buffer))) > CPERMSG) {
- nparts++;
- pos = len;
+ /* Add a mhbuild MIME composition file line for the body */
+ /* charset will be discovered/guessed by buildmimeproc */
+ fprintf(composition_file, "#text/plain %s\n", body_file_name);
}
- }
-
- /* 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);
/*
- * Output the header fields
- */
- fputs (cp, out);
- fprintf (out, "Subject: %s (part %d of %d)\n", subject, partno, nparts);
- fprintf (out, "%s: %s\n", VRSN_FIELD, VRSN_VALUE);
- fprintf (out, "%s: message/partial; id=\"%s\";\n", TYPE_FIELD, msgid);
- fprintf (out, "\tnumber=%d; total=%d\n", partno, nparts);
- fprintf (out, "%s: part %d of %d\n\n", DESCR_FIELD, partno, nparts);
+ ** 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 && *field != '-') {
+ if (strncasecmp(field, attach_hdr, length) == 0 &&
+ field[length] == ':') {
+ for (p = field+length+1; *p==' ' || *p=='\t'; p++) {
+ continue;
+ }
+ if (*p == '+') {
+ /* forwarded message */
+ fprintf(composition_file, "#forw [forwarded message(s)] %s\n", p);
+ } else {
+ make_mime_composition_file_entry(p);
+ }
+ }
+ }
+
+ fclose(composition_file);
/*
- * If this is the first in the collection, output the
- * header fields we are encapsulating at the beginning
- * of the body of the first message.
- */
- if (partno == 1) {
- if (dp)
- fputs (dp, out);
- fprintf (out, "Message-ID: %s\n", msgid);
- fprintf (out, "\n");
+ ** We're ready to roll! Run mhbuild on the composition file.
+ ** Note that mhbuild is in the context as buildmimeproc.
+ */
+ sprintf(buf, "%s %s", buildmimeproc, composition_file_name);
+
+ if (system(buf) != 0) {
+ clean_up_temporary_files();
+ return (NOTOK);
}
- pos = 0;
- for (;;) {
- long len;
-
- if (!fgets (buffer, sizeof(buffer) - 1, in)) {
- if (partno == nparts)
- break;
- adios (NULL, "premature eof");
- }
-
- if ((pos += (len = strlen (buffer))) > CPERMSG) {
- fseek (in, -len, SEEK_CUR);
- break;
- }
+ return (OK);
+}
- fputs (buffer, out);
+static void
+clean_up_temporary_files(void)
+{
+ unlink(body_file_name);
+ 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') {
+ 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;
+ }
}
- if (fflush (out))
- adios (tmpdrf, "error writing to");
+ /* NUL-terminate the field. */
+ *p = '\0';
- fclose (out);
+ return (c);
+}
- if (!pushsw && verbsw) {
- printf ("\n");
- fflush (stdout);
+static void
+make_mime_composition_file_entry(char *file_name)
+{
+ FILE *fp;
+ struct node *np;
+ char *cp;
+ char content_type[BUFSIZ];
+ char cmdbuf[BUFSIZ];
+ char *cmd = mimetypequeryproc;
+
+ for (np = m_defs; np; np = np->n_next) {
+ if (strcasecmp(np->n_name, mimetypequery)==0) {
+ cmd = np->n_field;
+ break;
+ }
}
+ snprintf(cmdbuf, sizeof cmdbuf, "%s %s", cmd, file_name);
- /* Pause here, if a delay is specified */
- if (delay > 0 && 1 < partno && partno <= nparts) {
- if (!pushsw) {
- printf ("pausing %d seconds before sending part %d...\n",
- delay, partno);
- fflush (stdout);
- }
- sleep ((unsigned int) delay);
+ if (!(fp = popen(cmdbuf, "r"))) {
+ clean_up_temporary_files();
+ adios(NULL, "unable to determine content type with `%s'",
+ cmdbuf);
+ }
+ if (fgets(content_type, sizeof content_type, fp) &&
+ (cp = strrchr(content_type, '\n'))) {
+ *cp = '\0';
+ } else {
+ strcpy(content_type, "application/octet-stream");
+ admonish(NULL, "problems with `%s', using fall back type `%s'",
+ cmdbuf, content_type);
}
+ pclose(fp);
- snprintf (partnum, sizeof(partnum), "%d", partno);
- status = sendaux (vec, vecp, tmpdrf, st);
- unlink (tmpdrf);
- if (status != OK)
- break;
+ /* TODO: don't use access(2) because it checks for ruid, not euid */
+ if (access(file_name, R_OK) != 0) {
+ clean_up_temporary_files();
+ adios(NULL, "unable to access file `%s'", file_name);
+ }
- /*
- * This is so sendaux will only annotate
- * the altmsg the first time it is called.
- */
- annotext = NULL;
- }
-
- free (cp);
- if (dp)
- free (dp);
-
- fclose (in); /* close the draft */
- return status;
-}
+ fprintf(composition_file, "#%s; name=\"%s\" <>{attachment}",
+ content_type,
+ (!(cp = strrchr(file_name, '/'))) ? file_name : cp + 1);
+ fprintf(composition_file, " %s\n", file_name);
+
+ return;
+}
/*
- * Annotate original message, and
- * call `postproc' to send message.
- */
+** Annotate original message, and
+** call `postproc' to send message.
+*/
static int
-sendaux (char **vec, int vecp, char *drft, struct stat *st)
+sendaux(char **vec, int vecp, char *drft, struct stat *st)
{
- 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];
+
+ fd = pushsw ? tmp_fd() : NOTOK;
+ fd2 = NOTOK;
+
+ vec[vecp++] = drft;
+ if (annotext && (fd2 = tmp_fd()) == NOTOK) {
+ admonish(NULL, "unable to create file for annotation list");
}
- }
- if (distfile && distout (drft, distfile, backup) == NOTOK)
- done (1);
- vec[vecp] = NULL;
+ if (distfile && distout(drft, distfile, backup) == NOTOK)
+ done(1);
+ vec[vecp] = NULL;
- for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
- sleep (5);
+ for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
+ sleep(5);
- switch (child_id) {
- case -1:
- /* oops -- fork error */
- adios ("fork", "unable to");
- break; /* NOT REACHED */
+ switch (child_id) {
+ case -1:
+ /* oops -- fork error */
+ adios("fork", "unable to");
+ 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 */
+ 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;
}
- break;
- }
- return status;
+ return status;
}
/*
- * Mail error notification (and possibly a copy of the
- * message) back to the user, using the mailproc
- */
+** Mail error notification (and possibly a copy of the
+** message) back to the user, using the mailproc
+*/
static void
-alert (char *file, int out)
+alert(char *file, int out)
{
- pid_t child_id;
- int i, in;
- char buf[BUFSIZ];
+ pid_t child_id;
+ int i, in;
+ char buf[BUFSIZ];
- for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
- sleep (5);
+ for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
+ sleep(5);
- switch (child_id) {
+ switch (child_id) {
case NOTOK:
- /* oops -- fork error */
- advise ("fork", "unable to");
+ /* 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);
+ /* 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;
- }
+ 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, mhbasename(mailproc), getusername(),
+ "-subject", buf, NULL);
+ fprintf(stderr, "unable to exec ");
+ perror(mailproc);
+ _exit(-1);
+
+ default: /* no waiting... */
+ break;
+ }
}
static int
-tmp_fd (void)
+tmp_fd(void)
{
- 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;
}
static void
-anno (int fd, struct stat *st)
+anno(int fd, struct stat *st)
{
- 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;
+ }
}
static void
-annoaux (int fd)
+annoaux(int fd)
{
- int fd2, fd3, msgnum;
- char *cp, *folder, *maildir;
- char buffer[BUFSIZ], **ap;
- FILE *fp;
- struct msgs *mp;
+ int fd2, fd3, msgnum;
+ char *cp, *folder, *maildir;
+ char buffer[BUFSIZ], **ap;
+ FILE *fp;
+ struct msgs *mp;
+
+ if ((folder = getenv("mhfolder")) == NULL || *folder == 0) {
+ if (debugsw)
+ admonish(NULL, "$mhfolder not set");
+ return;
+ }
+ maildir = toabsdir(folder);
+ if (chdir(maildir) == NOTOK) {
+ if (debugsw)
+ admonish(maildir, "unable to change directory to");
+ return;
+ }
+ if (!(mp = folder_read(folder))) {
+ if (debugsw)
+ admonish(NULL, "unable to read folder %s", folder);
+ return;
+ }
- if ((folder = getenv ("mhfolder")) == NULL || *folder == 0) {
- if (debugsw)
- admonish (NULL, "$mhfolder not set");
- return;
- }
- maildir = m_maildir (folder);
- if (chdir (maildir) == NOTOK) {
- if (debugsw)
- admonish (maildir, "unable to change directory to");
- return;
- }
- if (!(mp = folder_read (folder))) {
- if (debugsw)
- admonish (NULL, "unable to read folder %s");
- return;
- }
+ /* check for empty folder */
+ if (mp->nummsg == 0) {
+ if (debugsw)
+ admonish(NULL, "no messages in %s", folder);
+ goto oops;
+ }
- /* check for empty folder */
- if (mp->nummsg == 0) {
- if (debugsw)
- admonish (NULL, "no messages in %s", folder);
- goto oops;
- }
+ 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;
+ }
- 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);
- 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);
-
- 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);
+ 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);
+ }
}
- }
- free (cp);
+ free(cp);
oops:
- folder_free (mp); /* free folder/message structure */
+ folder_free(mp); /* free folder/message structure */
}
-void
-done (int status)
+static void
+armed_done(int status)
{
- if (armed)
- longjmp (env, status ? status : NOTOK);
+ longjmp(env, status ? status : NOTOK);
- exit (status);
+ exit(status);
}
projects / mmh / blobdiff