From c42222869e318fff5dec395eca3e776db3075455 Mon Sep 17 00:00:00 2001 From: markus schnalke Date: Wed, 8 Feb 2012 18:04:44 +0100 Subject: [PATCH] Moved sendsbr.c into send.c as it is not compiled into other binaries anymore. --- h/prototypes.h | 1 - uip/Makefile.in | 6 +- uip/send.c | 720 +++++++++++++++++++++++++++++++++++++++++++++++++++++- uip/sendsbr.c | 723 ------------------------------------------------------- 4 files changed, 713 insertions(+), 737 deletions(-) delete mode 100644 uip/sendsbr.c diff --git a/h/prototypes.h b/h/prototypes.h index 699c8b8..9425b6d 100644 --- a/h/prototypes.h +++ b/h/prototypes.h @@ -152,6 +152,5 @@ void annopreserve(int); int distout(char *, char *, char *); void replout(FILE *, char *, char *, struct msgs *, int, char *, char *, char *); -int sendsbr(char **, int, char *, struct stat *, int); int what_now(char *, int, int, char *, char *, int, struct msgs *, char *, int, char *); diff --git a/uip/Makefile.in b/uip/Makefile.in index b36bc75..80e8001 100644 --- a/uip/Makefile.in +++ b/uip/Makefile.in @@ -74,7 +74,7 @@ SRCS = ali.c aliasbr.c anno.c annosbr.c ap.c burst.c comp.c \ msgchk.c new.c packf.c pick.c picksbr.c \ prompter.c rcvdist.c rcvpack.c rcvstore.c rcvtty.c \ refile.c repl.c replsbr.c rmf.c rmm.c scan.c scansbr.c send.c \ - sendsbr.c sendfiles.sh show.c slocal.c sortm.c spost.c termsbr.c \ + sendfiles.sh show.c slocal.c sortm.c spost.c termsbr.c \ whatnow.c whatnowproc.c # auxiliary files @@ -204,8 +204,8 @@ rmm: rmm.o $(LOCALLIBS) scan: scan.o scansbr.o termsbr.o $(LOCALLIBS) $(LINK) scan.o scansbr.o termsbr.o $(LINKLIBS) $(TERMLIB) -send: send.o sendsbr.o annosbr.o distsbr.o $(LOCALLIBS) - $(LINK) send.o sendsbr.o annosbr.o distsbr.o $(LINKLIBS) +send: send.o annosbr.o distsbr.o $(LOCALLIBS) + $(LINK) send.o annosbr.o distsbr.o $(LINKLIBS) sendfiles: sendfiles.sh cp sendfiles.sh sendfiles diff --git a/uip/send.c b/uip/send.c index 7a8b8e6..da401e6 100644 --- a/uip/send.c +++ b/uip/send.c @@ -10,6 +10,64 @@ #include #include #include +#include +#include +#include +#include +#include + +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef TM_IN_SYS_TIME +# include +# else +# include +# endif +#endif + +int debugsw = 0; /* global */ +int forwsw = 1; +int inplace = 1; +int pushsw = 0; +int verbsw = 0; +char *altmsg = NULL; +char *annotext = NULL; +char *distfile = NULL; + +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 +*/ +char *getusername(void); + +/* +** static prototypes +*/ +static int sendsbr(char **, int, char *, struct stat *, int); +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 *); static struct swit switches[] = { @@ -48,16 +106,6 @@ static struct swit switches[] = { { NULL, 0 } }; -extern int debugsw; /* from sendsbr.c */ -extern int forwsw; -extern int inplace; -extern int pushsw; -extern int verbsw; - -extern char *altmsg; /* .. */ -extern char *annotext; -extern char *distfile; - int main(int argc, char **argv) @@ -274,3 +322,655 @@ main(int argc, char **argv) done(status); return 1; } + + +/* +** send message back-end +*/ +static int +sendsbr(char **vec, int vecp, char *drft, struct stat *st, int rename_drft) +{ + int status; + char buffer[BUFSIZ]; + 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; + + /* + ** 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; + + case NOTOK: + return (NOTOK); + + case DONE: + break; + } + + 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; + + default: + status = DONE; + break; + } + + done=exit; + 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(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 +attach(char *draft_file_name) +{ + 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); + + /* + ** 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; + } + } + + /* + ** 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; + } + } + if (has_body && non_ascii) + 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)); + + if (has_body) + body_file = fopen(body_file_name, "w"); + + 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."); + } + + /* + ** 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); + + if (has_body) { + /* Copy the message body to the temporary file. */ + while ((c = getc(draft_file)) != EOF) { + putc(c, body_file); + } + fclose(body_file); + + /* 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); + } + + /* + ** 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); + + /* + ** 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); + } + + return (OK); +} + +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; + } + } + + /* NUL-terminate the field. */ + *p = '\0'; + + return (c); +} + +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); + + 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); + + /* 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); + } + + 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. +*/ +static int +sendaux(char **vec, int vecp, char *drft, struct stat *st) +{ + 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; + + 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 */ + + 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); + } + } + break; + } + + return status; +} + + +/* +** Mail error notification (and possibly a copy of the +** message) back to the user, using the mailproc +*/ +static void +alert(char *file, int out) +{ + 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, mhbasename(mailproc), getusername(), + "-subject", buf, NULL); + fprintf(stderr, "unable to exec "); + perror(mailproc); + _exit(-1); + + default: /* no waiting... */ + break; + } +} + + +static int +tmp_fd(void) +{ + 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) +{ + 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()); + /* fall */ + + 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) +{ + 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; + } + + /* 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; + } + + 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, -2, 0); + } + } + + free(cp); + +oops: + folder_free(mp); /* free folder/message structure */ +} + + +static void +armed_done(int status) +{ + longjmp(env, status ? status : NOTOK); + + exit(status); +} diff --git a/uip/sendsbr.c b/uip/sendsbr.c deleted file mode 100644 index 029ccb7..0000000 --- a/uip/sendsbr.c +++ /dev/null @@ -1,723 +0,0 @@ -/* -** 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 -#include -#include -#include -#include -#include -#include -#include - -#ifdef TIME_WITH_SYS_TIME -# include -# include -#else -# ifdef TM_IN_SYS_TIME -# include -# else -# include -# endif -#endif - -int debugsw = 0; /* global */ -int forwsw = 1; -int inplace = 1; -int pushsw = 0; -int verbsw = 0; - -char *altmsg = NULL; /* .. */ -char *annotext = NULL; -char *distfile = NULL; - -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); -char *getusername(void); - -/* -** 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. -*/ - -int -sendsbr(char **vec, int vecp, char *drft, struct stat *st, int rename_drft) -{ - int status; - char buffer[BUFSIZ]; - 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; - - /* - ** 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; - - case NOTOK: - return (NOTOK); - - case DONE: - break; - } - - 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; - - default: - status = DONE; - break; - } - - done=exit; - 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(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 -attach(char *draft_file_name) -{ - 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); - - /* - ** 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; - } - } - - /* - ** 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; - } - } - if (has_body && non_ascii) - 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)); - - if (has_body) - body_file = fopen(body_file_name, "w"); - - 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."); - } - - /* - ** 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); - - if (has_body) { - /* Copy the message body to the temporary file. */ - while ((c = getc(draft_file)) != EOF) { - putc(c, body_file); - } - fclose(body_file); - - /* 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); - } - - /* - ** 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); - - /* - ** 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); - } - - return (OK); -} - -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; - } - } - - /* NUL-terminate the field. */ - *p = '\0'; - - return (c); -} - -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); - - 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); - - /* 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); - } - - 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. -*/ -static int -sendaux(char **vec, int vecp, char *drft, struct stat *st) -{ - 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; - - 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 */ - - 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); - } - } - break; - } - - return status; -} - - -/* -** Mail error notification (and possibly a copy of the -** message) back to the user, using the mailproc -*/ -static void -alert(char *file, int out) -{ - 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, mhbasename(mailproc), getusername(), - "-subject", buf, NULL); - fprintf(stderr, "unable to exec "); - perror(mailproc); - _exit(-1); - - default: /* no waiting... */ - break; - } -} - - -static int -tmp_fd(void) -{ - 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) -{ - 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()); - /* fall */ - - 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) -{ - 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; - } - - /* 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; - } - - 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, -2, 0); - } - } - - free(cp); - -oops: - folder_free(mp); /* free folder/message structure */ -} - - -static void -armed_done(int status) -{ - longjmp(env, status ? status : NOTOK); - - exit(status); -} -- 1.7.10.4