Generate a From: header, using localmbox, if the user doesn't provide

a -from when sending with mhmail.

diff --git a/man/mhmail.man b/man/mhmail.man
index 6e3cf13cb1a3c71a71887e6b0df42f298d220503..261fbc73ec3b65f880465d8730b06a0e7c900b2e 100644 (file)
--- a/man/mhmail.man
+++ b/man/mhmail.man
@@ -88,7 +88,12 @@ By using
 .B \-from
 .IR addr ,
 you can specify the \*(lqFrom:\*(rq header of
-the draft.  Naturally,
+the draft.  If no
+.B \-from
+switch is used when sending,
+.B mhmail
+will supply a \*(lqFrom:\*(rq header field using the sender's local mailbox.
+Naturally,
 .B post
 will fill\-in the \*(lqSender:\*(rq
 header correctly.

diff --git a/uip/mhmail.c b/uip/mhmail.c
index 76e9e80095a8383c650ae175d0fcb2c34aa593b6..6c5039c63b25003209ae990994982fd968316183 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>
@@ -140,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);