#include <h/signals.h>
#include <h/utils.h>
#include <signal.h>
+#include <fcntl.h>
+
static struct swit switches[] = {
#define BODYSW 0
#define SUBJSW 3
{ "subject text", 0 },
#define VERSIONSW 4
- { "version", 0 },
+ { "Version", 0 },
#define HELPSW 5
{ "help", 0 },
#define RESNDSW 6
/*
** static prototypes
*/
-static RETSIGTYPE intrser (int);
+static void intrser(int);
int
-main (int argc, char **argv)
+main(int argc, char **argv)
{
pid_t child_id;
- int status, i, iscc = 0, nvec;
+ int status, iscc = 0, nvec;
+ unsigned int i;
int queued = 0, resent = 0, somebody;
char *cp, *tolist = NULL, *cclist = NULL, *subject = NULL;
char *from = NULL, *body = NULL, **argp, **arguments;
#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
- invo_name = r1bindex (argv[0], '/');
+ invo_name = mhbasename(argv[0]);
/* foil search of user profile/context */
- if (context_foil (NULL) == -1)
- done (1);
+ if (context_foil(NULL) == -1)
+ done(1);
- /* If no arguments, just incorporate new mail */
+ /* Without arguments, exit. */
if (argc == 1) {
- execlp (incproc, r1bindex (incproc, '/'), NULL);
- adios (incproc, "unable to exec");
+ adios(NULL, "no interactive mail shell. Use inc/scan/show instead.");
}
- arguments = getarguments (invo_name, argc, argv, 0);
+ 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]]",
+ 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;
+ 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;
}
}
if (iscc)
- cclist = cclist ? add (cp, add (", ", cclist)) : getcpy (cp);
+ cclist = cclist ? add(cp, add(", ", cclist)) :
+ getcpy(cp);
else
- tolist = tolist ? add (cp, add (", ", tolist)) : getcpy (cp);
+ tolist = tolist ? add(cp, add(", ", tolist)) :
+ getcpy(cp);
}
if (tolist == NULL)
- adios (NULL, "usage: %s addrs ... [switches]", invo_name);
+ adios(NULL, "usage: %s addrs ... [switches]", invo_name);
- tfile = m_mktemp2(NULL, invo_name, NULL, &out);
- if (tfile == NULL) adios("mhmail", "unable to create temporary file");
+ tfile = m_mktemp2("/tmp/", invo_name, NULL, &out);
+ if (tfile == NULL)
+ adios("mhmail", "unable to create temporary file");
chmod(tfile, 0600);
- strncpy (tmpfil, tfile, sizeof(tmpfil));
+ strncpy(tmpfil, tfile, sizeof(tmpfil));
- SIGNAL2 (SIGINT, intrser);
+ SIGNAL2(SIGINT, intrser);
- fprintf (out, "%sTo: %s\n", resent ? "Resent-" : "", tolist);
+ fprintf(out, "%sTo: %s\n", resent ? "Resent-" : "", tolist);
if (cclist)
- fprintf (out, "%scc: %s\n", resent ? "Resent-" : "", cclist);
+ fprintf(out, "%sCc: %s\n", resent ? "Resent-" : "", cclist);
if (subject)
- fprintf (out, "%sSubject: %s\n", resent ? "Resent-" : "", subject);
+ fprintf(out, "%sSubject: %s\n", resent ? "Resent-" : "", subject);
if (from)
- fprintf (out, "%sFrom: %s\n", resent ? "Resent-" : "", from);
+ fprintf(out, "%sFrom: %s\n", resent ? "Resent-" : "", from);
if (!resent)
- fputs ("\n", out);
+ fputs("\n", out);
if (body) {
- fprintf (out, "%s", body);
- if (*body && *(body + strlen (body) - 1) != '\n')
- fputs ("\n", out);
+ fprintf(out, "%s", body);
+ 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");
+ 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) {
- unlink (tmpfil);
- done (1);
+ unlink(tmpfil);
+ done(1);
}
}
- fclose (out);
+ fclose(out);
nvec = 0;
- vec[nvec++] = r1bindex (postproc, '/');
+ vec[nvec++] = "spost";
vec[nvec++] = tmpfil;
if (resent)
vec[nvec++] = "-dist";
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) {
+ adios(NULL, "unable to fork");
+
+ } 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))) {
- 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 = 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");
}
- unlink (tmpfil);
- done (status ? 1 : 0);
- } else {
- /* child process */
- execvp (postproc, vec);
- fprintf (stderr, "unable to exec ");
- perror (postproc);
- _exit (-1);
+ unlink(tmpfil);
+ done(status ? 1 : 0);
}
return 0; /* dead code to satisfy the compiler */
}
-static RETSIGTYPE
-intrser (int i)
+static void
+intrser(int i)
{
-#ifndef RELIABLE_SIGNALS
- if (i)
- SIGNAL (i, SIG_IGN);
-#endif
-
- unlink (tmpfil);
- done (i != 0 ? 1 : 0);
+ unlink(tmpfil);
+ done(i != 0 ? 1 : 0);
}
projects / mmh / blobdiff