#include <h/signals.h>
#include <h/utils.h>
#include <signal.h>
+#include <fcntl.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 }
};
/*
** 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);
-
/* Without arguments, exit. */
if (argc == 1) {
adios(NULL, "no interactive mail shell. Use inc/scan/show instead.");
}
+ context_read();
+
arguments = getarguments(invo_name, argc, argv, 0);
argp = arguments;
adios(NULL, "missing argument to %s",
argp[-2]);
continue;
-
- case RESNDSW:
- resent++;
- continue;
-
- case QUEUESW:
- queued++;
- continue;
}
}
if (iscc)
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;
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);
+ done(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);
}
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);
}