For the mhstore -clobber test, cd to the Mail subdirectory so that

[mmh] / uip / mhmail.c

diff --git a/uip/mhmail.c b/uip/mhmail.c
index 377fccd..6c5039c 100644 (file)
--- a/uip/mhmail.c
+++ b/uip/mhmail.c
@@ -8,6 +8,7 @@
  */
 
 #include <h/mh.h>
+#include <h/mts.h>
 #include <h/signals.h>
 #include <h/utils.h>
 #include <signal.h>
@@ -44,7 +45,8 @@ int
 main (int argc, char **argv)
 {
     pid_t child_id;
-    int status, i, iscc = 0, nvec;
+    int status, iscc = 0, nvec;
+    size_t i;
     int queued = 0, resent = 0, somebody;
     char *cp, *tolist = NULL, *cclist = NULL, *subject = NULL;
     char *from = NULL, *body = NULL, **argp, **arguments;
@@ -83,10 +85,10 @@ main (int argc, char **argv)
                    snprintf (buf, sizeof(buf), "%s [addrs ... [switches]]",
                        invo_name);
                    print_help (buf, switches, 0);
-                   done (1);
+                   done (0);
                case VERSIONSW:
                    print_version(invo_name);
-                   done (1);
+                   done (0);
 
                case FROMSW: 
                    if (!(from = *argp++) || *from == '-')
@@ -139,6 +141,8 @@ main (int argc, char **argv)
        fprintf (out, "%sSubject: %s\n", resent ? "Resent-" : "", subject);
     if (from)
        fprintf (out, "%sFrom: %s\n", resent ? "Resent-" : "", from);
+    else
+       fprintf (out, "From: %s\n", getlocalmbox ());
     if (!resent)
        fputs ("\n", out);
 
@@ -200,11 +204,6 @@ main (int argc, char **argv)
 static void
 intrser (int i)
 {
-#ifndef RELIABLE_SIGNALS
-    if (i)
-       SIGNAL (i, SIG_IGN);
-#endif
-
     unlink (tmpfil);
     done (i != 0 ? 1 : 0);
 }