X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fsend.c;h=3c2db0ea222c00d9b75ee0725ec23bdea61bdd0c;hb=04e93dabf152cc30d0aeb043d65f911ef765a176;hp=e63074caac7cefcc357a0474a7fab20bf487563f;hpb=10e03b3fba3e01052baf92c963c46a2a5529b4e0;p=mmh diff --git a/uip/send.c b/uip/send.c index e63074c..3c2db0e 100644 --- a/uip/send.c +++ b/uip/send.c @@ -15,6 +15,8 @@ #include #include #include +#include +#include #ifdef HAVE_SYS_TIME_H # include @@ -22,7 +24,7 @@ #include int debugsw = 0; /* global */ -char *altmsg = NULL; +char *altmsg = NULL; char *annotext = NULL; char *distfile = NULL; @@ -50,6 +52,7 @@ 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[] = { @@ -70,7 +73,7 @@ static struct swit switches[] = { 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; @@ -122,43 +125,47 @@ main(int argc, char **argv) if (*cp == '/') { files[nfiles++] = cp; } else { - msgs[msgp++] = cp; + msgs[nmsgs++] = cp; } } } - if (!msgp && !nfiles) { - msgs[msgp++] = seq_cur; + if (!nmsgs && !nfiles) { + msgs[nmsgs++] = seq_cur; } - maildir = toabsdir(draftfolder); - if (chdir(maildir) == NOTOK) { - adios(maildir, "unable to change directory to"); - } - - 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) { + maildir = toabsdir(draftfolder); + if (chdir(maildir) == NOTOK) { + adios(maildir, "unable to change directory to"); } - } - seq_setprev(mp); + 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 msgranges/sequences and set SELECTED */ + for (msgnum = 0; msgnum < nmsgs; msgnum++) { + if (!m_convert(mp, msgs[msgnum])) { + done(1); + } + } + 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++] = getcpy(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) { @@ -166,9 +173,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(files[n], "unable to stat draft file"); } } @@ -207,8 +214,8 @@ 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); case NOTOK: @@ -425,9 +432,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); @@ -440,8 +445,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); @@ -461,6 +466,7 @@ signandenc(char *draft_file_name) char buf[BUFSIZ]; int dosign = 0; int doenc = 0; + int ret; if (!(draft_file = fopen(draft_file_name, "r"))) { adios(NULL, "can't open draft file `%s'.", draft_file_name); @@ -487,9 +493,14 @@ signandenc(char *draft_file_name) strcpy(composition_file_name, draft_file_name); /* We're ready to roll! */ - sprintf(buf, "mhsign -m%s '%s'", doenc ? " -e" : "", - draft_file_name); - if (system(buf) != 0) { + 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); } @@ -634,13 +645,14 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st) 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) { @@ -649,9 +661,9 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st) } } } - break; } + return status; } @@ -662,6 +674,9 @@ anno(struct stat *st) struct stat st2; char *msgs, *folder; char buf[BUFSIZ]; + char *vec[MAXARGS]; + int vecp; + char *cp, *dp; if (altmsg && (stat(altmsg, &st2) == NOTOK || st->st_mtime != st2.st_mtime || @@ -689,14 +704,50 @@ 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"); } } +char* +strexit(int 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"; + } +} + + static void armed_done(int status) {