X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsend.c;h=84e05dfb31386d64a6d1b312c8156e945bbba8ef;hp=e77f2b10c15107b370f200717638199daee64c2b;hb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;hpb=875a8bcc360e2cbb611b8163ff3d2234287be3bc diff --git a/uip/send.c b/uip/send.c index e77f2b1..84e05df 100644 --- a/uip/send.c +++ b/uip/send.c @@ -10,6 +10,46 @@ #include #include #include +#include +#include +#include +#include +#include + +#ifdef HAVE_SYS_TIME_H +# include +#endif +#include + +int debugsw = 0; /* global */ +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 */ + +/* +** static prototypes +*/ +static int sendsbr(char **, int, char *, struct stat *); +static void armed_done(int) NORETURN; +static void anno(struct stat *); +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[] = { @@ -17,65 +57,37 @@ static struct swit switches[] = { { "alias aliasfile", 0 }, #define DEBUGSW 1 { "debug", -5 }, -#define FILTSW 2 - { "filter filterfile", 0 }, -#define NFILTSW 3 - { "nofilter", 0 }, -#define FRMTSW 4 - { "format", 0 }, -#define NFRMTSW 5 - { "noformat", 0 }, -#define FORWSW 6 - { "forward", 0 }, -#define NFORWSW 7 - { "noforward", 0 }, -#define PUSHSW 8 - { "push", 0 }, -#define NPUSHSW 9 - { "nopush", 0 }, -#define UNIQSW 10 - { "unique", -6 }, -#define NUNIQSW 11 - { "nounique", -8 }, -#define VERBSW 12 +#define VERBSW 2 { "verbose", 0 }, -#define NVERBSW 13 +#define NVERBSW 3 { "noverbose", 0 }, -#define WATCSW 14 +#define WATCSW 4 { "watch", 0 }, -#define NWATCSW 15 +#define NWATCSW 5 { "nowatch", 0 }, -#define WIDTHSW 16 - { "width columns", 0 }, -#define VERSIONSW 17 - { "version", 0 }, -#define HELPSW 18 +#define VERSIONSW 6 + { "Version", 0 }, +#define HELPSW 7 { "help", 0 }, { NULL, 0 } }; -extern int debugsw; /* from sendsbr.c */ -extern int forwsw; -extern int inplace; -extern int pushsw; -extern int unique; -extern int verbsw; - -extern char *altmsg; /* .. */ -extern char *annotext; -extern char *distfile; - int main(int argc, char **argv) { - int msgp = 0, distsw = 0, vecp = 1; + int msgp = 0, nfiles = 0, distsw = 0, vecp = 1; int msgnum, status; + int in, out; + int n; char *cp, *maildir = NULL; char buf[BUFSIZ], **ap, **argp, **arguments; char *msgs[MAXARGS], *vec[MAXARGS]; + char *files[MAXARGS]; struct msgs *mp; struct stat st; + struct stat st2; + #ifdef LOCALE setlocale(LC_ALL, ""); @@ -110,27 +122,6 @@ main(int argc, char **argv) print_version(invo_name); done(1); - case PUSHSW: - pushsw++; - continue; - case NPUSHSW: - pushsw = 0; - continue; - - case UNIQSW: - unique++; - continue; - case NUNIQSW: - unique = 0; - continue; - - case FORWSW: - forwsw++; - continue; - case NFORWSW: - forwsw = 0; - continue; - case VERBSW: verbsw++; vec[vecp++] = --cp; @@ -142,67 +133,66 @@ main(int argc, char **argv) case DEBUGSW: debugsw++; /* fall */ - case NFILTSW: - case FRMTSW: - case NFRMTSW: case WATCSW: case NWATCSW: vec[vecp++] = --cp; continue; case ALIASW: - case FILTSW: - case WIDTHSW: vec[vecp++] = --cp; - if (!(cp = *argp++) || *cp == '-') + if (!(cp = *argp++) || *cp == '-') { adios(NULL, "missing argument to %s", argp[-2]); + } vec[vecp++] = cp; continue; } } else { - msgs[msgp++] = cp; + if (*cp == '/') { + files[nfiles++] = cp; + } else { + msgs[msgp++] = cp; + } } } - /* - ** check for "Aliasfile:" profile entry - */ + /* check for "Aliasfile:" profile entry */ if ((cp = context_find("Aliasfile"))) { char *dp = NULL; - for (ap = brkstring(dp = getcpy(cp), " ", "\n"); ap && *ap; - ap++) { + for (ap=brkstring(dp=getcpy(cp), " ", "\n"); ap && *ap; ap++) { vec[vecp++] = "-alias"; - vec[vecp++] = *ap; + vec[vecp++] = getcpy(etcpath(*ap)); } } - if (!msgp) + if (!msgp && !nfiles) { msgs[msgp++] = seq_cur; + } maildir = toabsdir(draftfolder); - if (chdir(maildir) == NOTOK) + if (chdir(maildir) == NOTOK) { adios(maildir, "unable to change directory to"); + } - /* read folder and create message structure */ - if (!(mp = folder_read(draftfolder))) + if (!(mp = folder_read(draftfolder))) { adios(NULL, "unable to read draft folder %s", draftfolder); - - /* check for empty folder */ - if (mp->nummsg == 0) + } + if (mp->nummsg == 0) { adios(NULL, "no messages in draft folder %s", draftfolder); - + } /* parse all the message ranges/sequences and set SELECTED */ - for (msgnum = 0; msgnum < msgp; msgnum++) - if (!m_convert(mp, msgs[msgnum])) + for (msgnum = 0; msgnum < msgp; msgnum++) { + if (!m_convert(mp, msgs[msgnum])) { done(1); - seq_setprev(mp); /* set the previous-sequence */ + } + } + seq_setprev(mp); for (msgp = 0, msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) { if (is_selected(mp, msgnum)) { - msgs[msgp++] = getcpy(m_name(msgnum)); + files[nfiles++] = getcpy(m_name(msgnum)); unset_exists(mp, msgnum); } } @@ -210,69 +200,55 @@ main(int argc, char **argv) mp->msgflags |= SEQMOD; seq_save(mp); - if (!(cp = getenv("SIGNATURE")) || !*cp) - if ((cp = context_find("signature")) && *cp) + if (!(cp = getenv("SIGNATURE")) || !*cp) { + if ((cp = context_find("signature")) && *cp) { m_putenv("SIGNATURE", cp); + } + } - for (msgnum = 0; msgnum < msgp; msgnum++) - if (stat(msgs[msgnum], &st) == NOTOK) - adios(msgs[msgnum], "unable to stat draft file"); + for (msgnum = 0; msgnum < nfiles; msgnum++) { + if (stat(files[msgnum], &st) == NOTOK) { + adios(files[msgnum], "unable to stat draft file"); + } + } - if ((annotext = getenv("mhannotate")) == NULL || *annotext == 0) + if (!(annotext = getenv("mhannotate")) || !*annotext) { annotext = NULL; - if (annotext && ((cp = getenv("mhinplace")) != NULL && *cp != 0)) - inplace = atoi(cp); - if ((altmsg = getenv("mhaltmsg")) == NULL || *altmsg == 0) + } + if (!(altmsg = getenv("mhaltmsg")) || !*altmsg) { altmsg = NULL; /* used by dist interface - see below */ + } - if ((cp = getenv("mhdist")) && *cp && (distsw = atoi (cp)) && altmsg) { + if ((cp = getenv("mhdist")) && *cp && (distsw = atoi(cp)) && altmsg) { vec[vecp++] = "-dist"; - distfile = getcpy(m_mktemp2(altmsg, invo_name, NULL, NULL)); - if (link(altmsg, distfile) == NOTOK) { - if (errno != EXDEV -#ifdef EISREMOTE - && errno != EISREMOTE -#endif /* EISREMOTE */ - ) - adios(distfile, "unable to link %s to", - altmsg); - free(distfile); - distfile = getcpy(m_mktemp2(NULL, invo_name, - NULL, NULL)); - { - int in, out; - struct stat st; - - if ((in = open(altmsg, O_RDONLY)) == NOTOK) - adios(altmsg, "unable to open"); - fstat(in, &st); - if ((out = creat(distfile, - (int) st.st_mode & 0777)) - == NOTOK) - adios(distfile, "unable to write"); - cpydata(in, out, altmsg, distfile); - close(in); - close(out); - } + if ((in = open(altmsg, O_RDONLY)) == NOTOK) { + adios(altmsg, "unable to open for reading"); + } + fstat(in, &st2); + distfile = getcpy(m_mktemp2(NULL, invo_name, NULL, NULL)); + if ((out = creat(distfile, (int)st2.st_mode & 0777))==NOTOK) { + adios(distfile, "unable to open for writing"); } + cpydata(in, out, altmsg, distfile); + close(in); + close(out); } else { distfile = NULL; } - if (altmsg == NULL || stat(altmsg, &st) == NOTOK) { + if (!altmsg || stat(altmsg, &st) == NOTOK) { st.st_mtime = 0; st.st_dev = 0; st.st_ino = 0; } - if (pushsw) - push(); - status = 0; - vec[0] = mhbasename(postproc); - closefds(3); + vec[0] = "spost"; + for (n=3; n= + sizeof (composition_file_name) - 6) { + advise(NULL, "unable to remove original composition file."); + } else { + if (!(p = strrchr(composition_file_name, '/'))) { + 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]; + int c; + int has_attachment; + int has_body; + int non_ascii; /* msg body contains non-ASCII chars */ + int length; /* length of attachment header field name */ + char *p; + + if (!(draft_file = fopen(draft_file_name, "r"))) { + adios(NULL, "can't open draft file `%s'.", draft_file_name); + } + + /* We'll grow the buffer as needed. */ + field = (char *)mh_xmalloc(field_size = 256); + + /* + ** Scan the draft file for an attachment header field name. + */ + 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; /* that's been already enough information */ + } + } + + if (!has_attachment && non_ascii==0) { + /* We don't need to convert it to MIME. */ + 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."); + } + + /* Copy non-attachment header fields to the temp composition file. */ + 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 mhbuild */ + 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 { + /* regular attachment */ + make_mime_composition_file_entry(p); + } + } + } + fclose(composition_file); + + /* We're ready to roll! */ + sprintf(buf, "mhbuild %s", composition_file_name); + if (system(buf) != 0) { + /* some problem */ + 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; + + /* + ** 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(field, field_size += 256); + p = field + n - 1; + } + } + *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); + } + + cp = (!(cp = strrchr(file_name, '/'))) ? file_name : cp + 1; + fprintf(composition_file, "#%s; name=\"%s\" <> [%s] {attachment}", + content_type, cp, cp); + + fprintf(composition_file, " %s\n", file_name); + + return; +} + +/* +** The back-end of the message sending back-end. +** Annotate original message, and call `spost' to send message. +*/ +static int +sendaux(char **vec, int vecp, char *drft, struct stat *st) +{ + pid_t child_id; + int status; + char backup[BUFSIZ]; + + vec[vecp++] = drft; + if (distfile && distout(drft, distfile, backup) == NOTOK) { + done(1); + } + vec[vecp] = NULL; + + switch (child_id = fork()) { + case -1: + /* oops -- fork error */ + adios("fork", "unable to"); + break; /* NOT REACHED */ + + case 0: + /* child process -- send it */ + execvp(*vec, vec); + fprintf(stderr, "unable to exec "); + perror(*vec); + _exit(-1); + break; /* NOT REACHED */ + + default: + /* parent process -- wait for it */ + if ((status = pidwait(child_id, NOTOK)) == OK) { + if (annotext) { + anno(st); + } + } else { + /* spost failed */ + advise(NULL, "message not delivered to anyone"); + if (distfile) { + unlink(drft); + if (rename(backup, drft) == NOTOK) { + advise(drft, "unable to rename %s to", + backup); + } + } + } + break; + } + + return status; +} + + +static void +anno(struct stat *st) +{ + struct stat st2; + char *msgs, *folder; + char buf[BUFSIZ]; + + 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; + } + + if (!(folder = getenv("mhfolder")) || !*folder) { + if (debugsw) { + admonish(NULL, "$mhfolder not set"); + } + return; + } + if (!(msgs = getenv("mhmessages")) || !*msgs) { + if (debugsw) { + admonish(NULL, "$mhmessages not set"); + } + return; + } + if (debugsw) { + advise(NULL, "annotate as `%s': %s %s", annotext, + folder, msgs); + } + snprintf(buf, sizeof buf, "anno -comp '%s' '+%s' %s", + annotext, folder, msgs); + if (system(buf) != 0) { + advise(NULL, "unable to annotate"); + } +} + + +static void +armed_done(int status) +{ + longjmp(env, status ? status : NOTOK); + + exit(status); +}