X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhmail.c;h=46b16fd21d58decf6ad9d2f8c38835362be31587;hp=a013ecb8361811898eecb0a30031819dacc27fb1;hb=fede6e42d81ce34fd5c1bbe7fb2757b281c2573a;hpb=5b792c4424571f05bc2008e3109797d18d7d00d1 diff --git a/uip/mhmail.c b/uip/mhmail.c index a013ecb..46b16fd 100644 --- a/uip/mhmail.c +++ b/uip/mhmail.c @@ -10,10 +10,12 @@ #include #include #include +#include + static struct swit switches[] = { #define BODYSW 0 - { "body text", 0 }, + { "bodytext text", 0 }, #define CCSW 1 { "cc addrs ...", 0 }, #define FROMSW 2 @@ -21,13 +23,9 @@ static struct swit switches[] = { #define SUBJSW 3 { "subject text", 0 }, #define VERSIONSW 4 - { "version", 0 }, + { "Version", 0 }, #define HELPSW 5 { "help", 0 }, -#define RESNDSW 6 - { "resent", -6 }, -#define QUEUESW 7 - { "queued", -6 }, { NULL, 0 } }; @@ -36,36 +34,30 @@ static char tmpfil[BUFSIZ]; /* ** static prototypes */ -static RETSIGTYPE intrser(int); +static void intrser(int); int main(int argc, char **argv) { pid_t child_id; - int status, i, iscc = 0, nvec; - int queued = 0, resent = 0, somebody; + int status, iscc = 0, nvec; char *cp, *tolist = NULL, *cclist = NULL, *subject = NULL; char *from = NULL, *body = NULL, **argp, **arguments; char *vec[5], buf[BUFSIZ]; FILE *out; char *tfile = NULL; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); - /* foil search of user profile/context */ - if (context_foil(NULL) == -1) - done(1); - - /* If no arguments, just incorporate new mail */ + /* Without arguments, exit. */ if (argc == 1) { - execlp(incproc, mhbasename(incproc), NULL); - adios(incproc, "unable to exec"); + adios(NULL, "no interactive mail shell. Use inc/scan/show instead."); } + context_read(); + arguments = getarguments(invo_name, argc, argv, 0); argp = arguments; @@ -74,19 +66,20 @@ main(int argc, char **argv) switch (smatch(++cp, switches)) { case AMBIGSW: ambigsw(cp, switches); - done(1); + /* sysexits.h EX_USAGE */ + exit(1); case UNKWNSW: adios(NULL, "-%s unknown", cp); case HELPSW: snprintf(buf, sizeof(buf), - "%s [addrs ... [switches]]", + "%s addrs... [switches]", invo_name); print_help(buf, switches, 0); - done(1); + exit(0); case VERSIONSW: print_version(invo_name); - done(1); + exit(0); case FROMSW: if (!(from = *argp++) || *from == '-') @@ -109,14 +102,6 @@ main(int argc, char **argv) adios(NULL, "missing argument to %s", argp[-2]); continue; - - case RESNDSW: - resent++; - continue; - - case QUEUESW: - queued++; - continue; } } if (iscc) @@ -130,7 +115,7 @@ main(int argc, char **argv) if (tolist == NULL) adios(NULL, "usage: %s addrs ... [switches]", invo_name); - tfile = m_mktemp2(NULL, invo_name, NULL, &out); + tfile = m_mktemp2("/tmp/", invo_name, NULL, &out); if (tfile == NULL) adios("mhmail", "unable to create temporary file"); chmod(tfile, 0600); @@ -138,80 +123,87 @@ main(int argc, char **argv) SIGNAL2(SIGINT, intrser); - fprintf(out, "%sTo: %s\n", resent ? "Resent-" : "", tolist); + fprintf(out, "To: %s\n", tolist); if (cclist) - fprintf(out, "%sCc: %s\n", resent ? "Resent-" : "", cclist); + fprintf(out, "Cc: %s\n", cclist); if (subject) - fprintf(out, "%sSubject: %s\n", resent ? "Resent-" : "", subject); + fprintf(out, "Subject: %s\n", subject); if (from) - fprintf(out, "%sFrom: %s\n", resent ? "Resent-" : "", from); - if (!resent) - fputs("\n", out); + fprintf(out, "From: %s\n", from); + fputs("\n", out); if (body) { fprintf(out, "%s", body); - if (*body && *(body + strlen(body) - 1) != '\n') + if (*body && body[strlen(body) - 1] != '\n') fputs("\n", out); } else { - for (somebody = 0; (i = fread(buf, sizeof(*buf), sizeof(buf), - stdin)) > 0; somebody++) - if (fwrite(buf, sizeof(*buf), i, out) != i) + int empty = 1; + + while (fgets(buf, sizeof buf, stdin)) { + if (buf[0]=='.' && buf[1]=='\n') { + /* A period alone on a line means EOF. */ + break; + } + empty = 0; + if (fputs(buf, out) == EOF) { adios(tmpfil, "error writing"); - if (!somebody) { + } + } + if (empty) { unlink(tmpfil); - done(1); + adios(NULL, "not sending message with empty body"); } } fclose(out); nvec = 0; - vec[nvec++] = mhbasename(postproc); + vec[nvec++] = "spost"; vec[nvec++] = tmpfil; - if (resent) - vec[nvec++] = "-dist"; - if (queued) - vec[nvec++] = "-queued"; vec[nvec] = NULL; - for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++) - sleep(5); - - if (child_id == NOTOK) { + if ((child_id = fork()) == NOTOK) { /* report failure and then send it */ adios(NULL, "unable to fork"); - } else if (child_id) { + + } else if (child_id == 0) { + /* child process */ + execvp(*vec, vec); + fprintf(stderr, "unable to exec "); + perror(*vec); + _exit(-1); + + } else { /* parent process */ - if ((status = pidXwait(child_id, postproc))) { + if ((status = pidXwait(child_id, *vec))) { + /* spost failed, save draft as dead.letter */ + int in, out; + + in = open(tmpfil, O_RDONLY); + out = creat("dead.letter", 0600); + if (in == -1 || out == -1) { + fprintf(stderr, "Letter left at %s.\n", + tmpfil); + /* sysexits.h exit-status from spost */ + exit(status ? 1 : 0); + } + cpydata(in, out, tmpfil, "dead.letter"); + close(in); + close(out); fprintf(stderr, "Letter saved in dead.letter\n"); - execl("/bin/mv", "mv", tmpfil, "dead.letter", NULL); - execl("/usr/bin/mv", "mv", tmpfil, "dead.letter", - NULL); - perror("mv"); - _exit(-1); } unlink(tmpfil); - done(status ? 1 : 0); - } else { - /* child process */ - execvp(postproc, vec); - fprintf(stderr, "unable to exec "); - perror(postproc); - _exit(-1); + /* sysexits.h exit status from spost */ + exit(status ? 1 : 0); } return 0; /* dead code to satisfy the compiler */ } -static RETSIGTYPE +static void intrser(int i) { -#ifndef RELIABLE_SIGNALS - if (i) - SIGNAL(i, SIG_IGN); -#endif - unlink(tmpfil); - done(i != 0 ? 1 : 0); + exit(i != 0 ? 1 : 0); }