#include <h/signals.h>
#include <h/utils.h>
#include <signal.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <locale.h>
+#include <sysexits.h>
static struct swit switches[] = {
#define BODYSW 0
- { "body text", 0 },
+ { "bodytext text", 0 },
#define CCSW 1
{ "cc addrs ...", 0 },
#define FROMSW 2
#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 }
};
+char *version=VERSION;
+
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(EX_USAGE, NULL, "no interactive mail shell. Use inc/scan/show instead.");
}
+ context_read();
+
arguments = getarguments(invo_name, argc, argv, 0);
argp = arguments;
while ((cp = *argp++)) {
if (*cp == '-') {
switch (smatch(++cp, switches)) {
- case AMBIGSW:
- ambigsw(cp, switches);
- done(1);
- case UNKWNSW:
- adios(NULL, "-%s unknown", cp);
-
- case HELPSW:
- snprintf(buf, sizeof(buf), "%s [addrs ... [switches]]", invo_name);
- print_help(buf, switches, 0);
- done(1);
- case VERSIONSW:
- print_version(invo_name);
- done(1);
-
- case FROMSW:
- if (!(from = *argp++) || *from == '-')
- adios(NULL, "missing argument to %s", argp[-2]);
- continue;
-
- case BODYSW:
- if (!(body = *argp++) || *body == '-')
- adios(NULL, "missing argument to %s", argp[-2]);
- continue;
-
- case CCSW:
- iscc++;
- continue;
-
- case SUBJSW:
- if (!(subject = *argp++) || *subject == '-')
- adios(NULL, "missing argument to %s", argp[-2]);
- continue;
-
- case RESNDSW:
- resent++;
- continue;
-
- case QUEUESW:
- queued++;
- continue;
+ case AMBIGSW:
+ ambigsw(cp, switches);
+ exit(EX_USAGE);
+ case UNKWNSW:
+ adios(EX_USAGE, NULL, "-%s unknown", cp);
+
+ case HELPSW:
+ snprintf(buf, sizeof(buf),
+ "%s addrs... [switches]",
+ invo_name);
+ print_help(buf, switches, 0);
+ exit(argc == 2 ? EX_OK : EX_USAGE);
+ case VERSIONSW:
+ print_version(invo_name);
+ exit(argc == 2 ? EX_OK : EX_USAGE);
+
+ case FROMSW:
+ if (!(from = *argp++) || *from == '-')
+ adios(EX_USAGE, NULL, "missing argument to %s",
+ argp[-2]);
+ continue;
+
+ case BODYSW:
+ if (!(body = *argp++) || *body == '-')
+ adios(EX_USAGE, NULL, "missing argument to %s",
+ argp[-2]);
+ continue;
+
+ case CCSW:
+ iscc++;
+ continue;
+
+ case SUBJSW:
+ if (!(subject = *argp++) || *subject == '-')
+ adios(EX_USAGE, NULL, "missing argument to %s",
+ argp[-2]);
+ continue;
}
}
if (iscc)
cclist = cclist ? add(cp, add(", ", cclist)) :
- getcpy(cp);
+ mh_xstrdup(cp);
else
tolist = tolist ? add(cp, add(", ", tolist)) :
- getcpy(cp);
+ mh_xstrdup(cp);
}
if (tolist == NULL)
- adios(NULL, "usage: %s addrs ... [switches]", invo_name);
+ adios(EX_USAGE, 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");
+ adios(EX_CANTCREAT, "mhmail", "unable to create temporary file");
chmod(tfile, 0600);
strncpy(tmpfil, tfile, sizeof(tmpfil));
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)
- adios(tmpfil, "error writing");
- if (!somebody) {
+ 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(EX_IOERR, tmpfil, "error writing");
+ }
+ }
+ if (empty) {
unlink(tmpfil);
- done(1);
+ adios(EX_DATAERR, 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) {
- /* report failure and then send it */
- adios(NULL, "unable to fork");
- } else if (child_id) {
- /* parent process */
- if ((status = pidXwait(child_id, postproc))) {
- 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);
+ if ((status = execprog(*vec, 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);
+ exit(status);
}
- unlink(tmpfil);
- done(status ? 1 : 0);
- } else {
- /* child process */
- execvp(postproc, vec);
- fprintf(stderr, "unable to exec ");
- perror(postproc);
- _exit(-1);
+ cpydata(in, out, tmpfil, "dead.letter");
+ close(in);
+ close(out);
+ fprintf(stderr, "Letter saved in dead.letter\n");
}
-
- return 0; /* dead code to satisfy the compiler */
+ unlink(tmpfil);
+ exit(status);
}
-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(EX_IOERR);
}
projects / mmh / blobdiff