Move #include from h/mh.h to source files

[mmh] / uip / mhmail.c

diff --git a/uip/mhmail.c b/uip/mhmail.c
index a85899d..eea92b7 100644 (file)
--- a/uip/mhmail.c
+++ b/uip/mhmail.c
@@ -11,7 +11,9 @@
 #include <h/utils.h>
 #include <signal.h>
 #include <fcntl.h>
-
+#include <unistd.h>
+#include <sys/stat.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define BODYSW  0
@@ -40,7 +42,6 @@ static void intrser(int);
 int
 main(int argc, char **argv)
 {
-       pid_t child_id;
        int status, iscc = 0, nvec;
        char *cp, *tolist = NULL, *cclist = NULL, *subject = NULL;
        char *from = NULL, *body = NULL, **argp, **arguments;
@@ -48,20 +49,16 @@ main(int argc, char **argv)
        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;
 
@@ -70,7 +67,8 @@ 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);
 
@@ -79,10 +77,10 @@ main(int argc, char **argv)
                                                "%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 == '-')
@@ -164,40 +162,26 @@ main(int argc, char **argv)
        vec[nvec++] = tmpfil;
        vec[nvec] = NULL;
 
-       if ((child_id = fork()) == NOTOK) {
-               /* report failure and then send it */
-               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, *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");
+       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);
+                       /* sysexits.h exit-status from spost */
+                       exit(status ? 1 : 0);
                }
-               unlink(tmpfil);
-               done(status ? 1 : 0);
+               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);
+       /* sysexits.h exit status from spost */
+       exit(status ? 1 : 0);
 }
 
 
@@ -205,6 +189,6 @@ static void
 intrser(int i)
 {
        unlink(tmpfil);
-       done(i != 0 ? 1 : 0);
+       exit(i != 0 ? 1 : 0);
 }