X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsend.c;h=d7691db99a332a57c9ddc6322303cc6371b7bd91;hp=0660e9588a376d52f640b0be4a4a81785ec06c03;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=ca0b3e830b86700d9e5e31b1784de2bdcaf58fc5 diff --git a/uip/send.c b/uip/send.c index 0660e95..d7691db 100644 --- a/uip/send.c +++ b/uip/send.c @@ -11,23 +11,30 @@ #include #include #include -#include #include #include #include +#include +#include +#include +#include +#include +#include #ifdef HAVE_SYS_TIME_H # include #endif #include +#ifdef HAVE_SYS_PARAM_H +# include +#endif + int debugsw = 0; /* global */ -char *altmsg = NULL; +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 */ @@ -42,13 +49,14 @@ 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 int signandenc(char *); static void clean_up_temporary_files(void); static int get_line(void); static void make_mime_composition_file_entry(char *); +static char* strexit(int status); static struct swit switches[] = { @@ -65,15 +73,16 @@ static struct swit switches[] = { { NULL, 0 } }; +char *version=VERSION; int main(int argc, char **argv) { - int msgp = 0, nfiles = 0, distsw = 0, vecp = 1; + int nmsgs = 0, nfiles = 0, distsw = 0, vecp = 1; int msgnum, status; int in, out; int n; - char *cp, *maildir = NULL; + char *cp, *maildir = NULL, *folder = NULL; char buf[BUFSIZ], **argp, **arguments; char *msgs[MAXARGS], *vec[MAXARGS]; char *files[MAXARGS]; @@ -95,19 +104,19 @@ main(int argc, char **argv) switch (smatch(++cp, switches)) { case AMBIGSW: ambigsw(cp, switches); - done(1); + exit(EX_USAGE); case UNKWNSW: - adios(NULL, "-%s unknown\n", cp); + adios(EX_USAGE, NULL, "-%s unknown\n", cp); case HELPSW: snprintf(buf, sizeof(buf), "%s [file] [switches]", invo_name); print_help(buf, switches, 1); - done(1); + exit(argc == 2 ? EX_OK : EX_USAGE); case VERSIONSW: print_version(invo_name); - done(1); + exit(argc == 2 ? EX_OK : EX_USAGE); case DEBUGSW: debugsw++; @@ -117,47 +126,58 @@ main(int argc, char **argv) vec[vecp++] = --cp; continue; } + } else if (*cp == '+' || *cp == '@') { + if (folder) { + adios(EX_USAGE, NULL, "only one folder at a time!"); + } else { + folder = mh_xstrdup(expandfol(cp)); + } } else { if (*cp == '/') { files[nfiles++] = cp; } else { - msgs[msgp++] = cp; + msgs[nmsgs++] = cp; } } } - if (!msgp && !nfiles) { - msgs[msgp++] = seq_cur; - } - maildir = toabsdir(draftfolder); - - if (chdir(maildir) == NOTOK) { - adios(maildir, "unable to change directory to"); + if (!nmsgs && !nfiles) { + msgs[nmsgs++] = seq_cur; } - if (!(mp = folder_read(draftfolder))) { - adios(NULL, "unable to read draft folder %s", draftfolder); - } - 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])) { - done(1); + if (nmsgs) { + folder = folder ? folder : draftfolder; + maildir = toabsdir(folder); + if (chdir(maildir) == NOTOK) { + adios(EX_OSERR, maildir, "unable to change directory to"); } - } - seq_setprev(mp); + if (!(mp = folder_read(folder))) { + adios(EX_IOERR, NULL, "unable to read folder %s", + folder); + } + if (mp->nummsg == 0) { + adios(EX_DATAERR, NULL, "no messages in folder %s", + folder); + } + /* parse all the msgranges/sequences and set SELECTED */ + for (msgnum = 0; msgnum < nmsgs; msgnum++) { + if (!m_convert(mp, msgs[msgnum])) { + exit(EX_USAGE); + } + } + seq_setprev(mp); - for (msgp = 0, msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) { - if (is_selected(mp, msgnum)) { - files[nfiles++] = getcpy(m_name(msgnum)); - unset_exists(mp, msgnum); + for (nmsgs = 0, msgnum = mp->lowsel; + msgnum <= mp->hghsel; msgnum++) { + if (is_selected(mp, msgnum)) { + files[nfiles++] = mh_xstrdup(m_name(msgnum)); + unset_exists(mp, msgnum); + } } - } - mp->msgflags |= SEQMOD; - seq_save(mp); + mp->msgflags |= SEQMOD; + seq_save(mp); + } if (!(cp = getenv("SIGNATURE")) || !*cp) { if ((cp = context_find("signature")) && *cp) { @@ -165,9 +185,9 @@ main(int argc, char **argv) } } - for (msgnum = 0; msgnum < nfiles; msgnum++) { - if (stat(files[msgnum], &st) == NOTOK) { - adios(files[msgnum], "unable to stat draft file"); + for (n = 0; n < nfiles; n++) { + if (stat(files[n], &st) == NOTOK) { + adios(EX_IOERR, files[n], "unable to stat draft file"); } } @@ -181,12 +201,12 @@ main(int argc, char **argv) if ((cp = getenv("mhdist")) && *cp && (distsw = atoi(cp)) && altmsg) { vec[vecp++] = "-dist"; if ((in = open(altmsg, O_RDONLY)) == NOTOK) { - adios(altmsg, "unable to open for reading"); + adios(EX_IOERR, altmsg, "unable to open for reading"); } fstat(in, &st2); - distfile = getcpy(m_mktemp2(NULL, invo_name, NULL, NULL)); + distfile = mh_xstrdup(m_mktemp2(NULL, invo_name, NULL, NULL)); if ((out = creat(distfile, (int)st2.st_mode & 0777))==NOTOK) { - adios(distfile, "unable to open for writing"); + adios(EX_IOERR, distfile, "unable to open for writing"); } cpydata(in, out, altmsg, distfile); close(in); @@ -206,10 +226,10 @@ main(int argc, char **argv) close(n); } - for (msgnum = 0; msgnum < nfiles; msgnum++) { - switch (sendsbr(vec, vecp, files[msgnum], &st)) { + for (n = 0; n < nfiles; n++) { + switch (sendsbr(vec, vecp, files[n], &st)) { case DONE: - done(++status); + exit(++status); case NOTOK: status++; /* fall */ case OK: @@ -218,8 +238,7 @@ main(int argc, char **argv) } context_save(); - done(status); - return 1; + return status; } @@ -229,8 +248,7 @@ main(int argc, char **argv) static int sendsbr(char **vec, int vecp, char *drft, struct stat *st) { - int status; - char buffer[BUFSIZ]; + int status, dupfd; char *original_draft; /* @@ -251,6 +269,7 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st) */ switch (attach(drft)) { case OK: + /* successfully MIMEified: use generate draft */ drft = composition_file_name; break; @@ -258,30 +277,46 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st) return (NOTOK); case DONE: + /* already in MIME format: keep original draft */ break; } - done=armed_done; - switch (setjmp(env)) { + /* + ** Sign and encrypt the message as needed. + ** 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 (signandenc(drft)) { case OK: - status = sendaux(vec, vecp, drft, st) ? NOTOK : OK; - if (status == OK) { - /* move original draft to +trash folder */ - snprintf(buffer, sizeof buffer, - " 127 || *p < 0) { - non_ascii = 1; - } - } - if (has_body && non_ascii) { - break; /* that's been already enough information */ - } + if (!(draft_file = fopen(draft_file_name, "r"))) { + adios(EX_IOERR, NULL, "can't open draft file `%s'.", draft_file_name); } - if (!has_attachment && non_ascii==0) { - /* We don't need to convert it to MIME. */ - return DONE; - } + /* We'll grow the buffer as needed. */ + field = mh_xcalloc(field_size = 256, sizeof(char)); /* - ** Else: mimify + ** MIMEify */ /* Make names for the temporary files. */ @@ -363,19 +360,27 @@ attach(char *draft_file_name) m_mktemp(toabsdir(invo_name), NULL, NULL), sizeof (composition_file_name)); - if (has_body) { - body_file = fopen(body_file_name, "w"); - } + body_file = fopen(body_file_name, "w"); composition_file = fopen(composition_file_name, "w"); - if ((has_body && !body_file) || !composition_file) { + if (!body_file || !composition_file) { clean_up_temporary_files(); - adios(NULL, "unable to open all of the temporary files."); + adios(EX_IOERR, 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, VRSN_FIELD, strlen(VRSN_FIELD))==0 && + field[strlen(VRSN_FIELD)] == ':') { + /* + ** The draft is already in MIME format, thus + ** back out and use the original draft file. + */ + clean_up_temporary_files(); + return DONE; + } + if (strncasecmp(field, attach_hdr, length) != 0 || field[length] != ':') { fprintf(composition_file, "%s\n", field); @@ -383,17 +388,15 @@ attach(char *draft_file_name) } 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); + /* 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 @@ -404,9 +407,7 @@ attach(char *draft_file_name) 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; - } + p = trim(field+length+1); if (*p == '+') { /* forwarded message */ fprintf(composition_file, "#forw [forwarded message(s)] %s\n", p); @@ -419,8 +420,8 @@ attach(char *draft_file_name) fclose(composition_file); /* We're ready to roll! */ - sprintf(buf, "mhbuild %s", composition_file_name); - if (system(buf) != 0) { + if (execprogl("mhbuild", "mhbuild", composition_file_name, + (char *)NULL) != 0) { /* some problem */ clean_up_temporary_files(); return (NOTOK); @@ -434,6 +435,63 @@ attach(char *draft_file_name) return (OK); } +static int +signandenc(char *draft_file_name) +{ + char buf[BUFSIZ]; + int dosign = 0; + int doenc = 0; + int ret; + + if(distfile) { + return DONE; + } + + if (!(draft_file = fopen(draft_file_name, "r"))) { + adios(EX_IOERR, NULL, "can't open draft file `%s'.", draft_file_name); + } + + /* We'll grow the buffer as needed. */ + field = mh_xcalloc(field_size = 256, sizeof(char)); + + /* Scan the draft file for an attachment header field name. */ + while (get_line() != EOF && *field != '\0' && *field != '-') { + if (strncasecmp(field, sign_hdr, strlen(sign_hdr))==0 && + field[strlen(sign_hdr)] == ':') { + dosign = 1; + } + if (strncasecmp(field, enc_hdr, strlen(enc_hdr))==0 && + field[strlen(enc_hdr)] == ':') { + doenc = 1; + } + } + if (!dosign && !doenc) { + return DONE; + } + + strcpy(composition_file_name, draft_file_name); + + /* We're ready to roll! */ + if (doenc) { + ret = execprogl("mhsign", "mhsign", "-m", "-e", + draft_file_name, (char *)NULL); + } else { + ret = execprogl("mhsign", "mhsign", "-m", + draft_file_name, (char *)NULL); + } + if (ret != 0) { + /* some problem */ + return (NOTOK); + } + /* Remove the automatically created backup of mhsign. */ + snprintf(buf, sizeof buf, "%s.orig", draft_file_name); + if (unlink(buf) == -1) { + advise(NULL, "unable to remove original draft file."); + } + + return (OK); +} + static void clean_up_temporary_files(void) { @@ -463,7 +521,7 @@ get_line(void) break; } if (++n >= field_size - 1) { - field = (char *)mh_xrealloc(field, field_size += 256); + field = mh_xrealloc(field, field_size += 256); p = field + n - 1; } } @@ -481,6 +539,7 @@ make_mime_composition_file_entry(char *file_name) char content_type[BUFSIZ]; char cmdbuf[BUFSIZ]; char *cmd = mimetypequeryproc; + int semicolon = 0; for (np = m_defs; np; np = np->n_next) { if (strcasecmp(np->n_name, mimetypequery)==0) { @@ -492,7 +551,7 @@ make_mime_composition_file_entry(char *file_name) if (!(fp = popen(cmdbuf, "r"))) { clean_up_temporary_files(); - adios(NULL, "unable to determine content type with `%s'", + adios(EX_IOERR, NULL, "unable to determine content type with `%s'", cmdbuf); } if (fgets(content_type, sizeof content_type, fp) && @@ -508,14 +567,26 @@ make_mime_composition_file_entry(char *file_name) /* 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); + adios(EX_IOERR, 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); + /* Check for broken file(1). See man page mh-profile(5). */ + for (cp=content_type; *cp; cp++) { + if (isspace(*cp)) { + if (!semicolon) { + adios(EX_SOFTWARE, NULL, "Sorry, your Mime-Type-Query command (%s) is broken.\n\tThe output misses a semicolon before the whitespace.\n\tOutput was: %s", cmd, content_type); + } + } else if (*cp == ';') { + semicolon = 1; + } else { + semicolon = 0; + } + } - fprintf(composition_file, " %s\n", file_name); + cp = (!(cp = strrchr(file_name, '/'))) ? file_name : cp + 1; + fprintf(composition_file, + "#%s; name=\"%s\" <> [%s] {attachment} %s\n", + content_type, cp, cp, file_name); return; } @@ -533,33 +604,34 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st) vec[vecp++] = drft; if (distfile && distout(drft, distfile, backup) == NOTOK) { - done(1); + return DONE; } vec[vecp] = NULL; switch (child_id = fork()) { case -1: /* oops -- fork error */ - adios("fork", "unable to"); - break; /* NOT REACHED */ + advise("fork", "unable to"); + return DONE; case 0: /* child process -- send it */ execvp(*vec, vec); fprintf(stderr, "unable to exec "); perror(*vec); - _exit(-1); + _exit(EX_OSERR); break; /* NOT REACHED */ default: /* parent process -- wait for it */ - if ((status = pidwait(child_id, NOTOK)) == OK) { + status = pidwait(child_id, NOTOK); + if (WIFEXITED(status) && WEXITSTATUS(status) == EX_OK) { if (annotext) { anno(st); } } else { /* spost failed */ - advise(NULL, "message not delivered to anyone"); + advise(NULL, "%s", strexit(status)); if (distfile) { unlink(drft); if (rename(backup, drft) == NOTOK) { @@ -568,10 +640,9 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st) } } } - break; } - return status; + return status ? NOTOK : status; } @@ -581,6 +652,9 @@ anno(struct stat *st) struct stat st2; char *msgs, *folder; char buf[BUFSIZ]; + char *vec[MAXARGS]; + int vecp = 0; + char *cp, *dp; if (altmsg && (stat(altmsg, &st2) == NOTOK || st->st_mtime != st2.st_mtime || @@ -608,18 +682,45 @@ anno(struct stat *st) 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) { + vec[vecp++] = "anno"; + vec[vecp++] = "-comp"; + vec[vecp++] = annotext; + snprintf(buf, sizeof buf, "+%s", folder); + vec[vecp++] = buf; + + while (isspace(*msgs)) { + msgs++; + } + for (cp=dp=msgs; *cp; cp++) { + if (isspace(*cp)) { + while (isspace(*cp)) { + *cp++ = '\0'; + } + vec[vecp++] = dp; + dp = cp; + } + } + vec[vecp++] = dp; + vec[vecp] = NULL; + if (execprog(*vec, vec) != 0) { advise(NULL, "unable to annotate"); } } -static void -armed_done(int status) +char* +strexit(int status) { - longjmp(env, status ? status : NOTOK); - - exit(status); + if (WIFSIGNALED(status)) { + return "spost or sendmail killed by signal"; + } + if (!WIFEXITED(status)) { + return "message not delivered to anyone"; + } + switch (WEXITSTATUS(status)) { + case EX_TEMPFAIL: + return "Temporary error, maybe the MTA has queued the message"; + default: + return "message not delivered to anyone"; + } }