X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fsendsbr.c;h=d866ebc925b13a75dfdd513894b5d1f7b52cf426;hb=3bebe0e894828d80183926d4fc19fc01cd3c274e;hp=f216e952df88016a4ecbb2b100f169f29777bb02;hpb=88b27ae07f694e90637c2a852b754539c2f70172;p=mmh

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index f216e95..d866ebc 100644
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -9,7 +9,7 @@
 
 #include <h/mh.h>
 #include <h/signals.h>
-#include <h/m_setjmp.h>
+#include <setjmp.h>
 #include <signal.h>
 #include <fcntl.h>
 #include <h/mime.h>
@@ -110,7 +110,7 @@ sendsbr (char **vec, int vecp, char *drft, struct stat *st, int rename_drft, cha
     }
 
     done=armed_done;
-    switch (m_setjmp (env)) {
+    switch (setjmp (env)) {
     case OK: 
 	/*
 	 * If given -push and -unique (which is undocumented), then
@@ -192,6 +192,7 @@ attach(char *attachment_header_field_name, char *draft_file_name,
     int			has_body;		/* draft has a message body */
     int			length;			/* length of attachment header field name */
     char		*p;			/* miscellaneous string pointer */
+    FILE		*fp;			/* pointer for mhn.defaults */
 
     /*
      *	Open up the draft file.
@@ -301,6 +302,11 @@ attach(char *attachment_header_field_name, char *draft_file_name,
      *	that specify attachments.  Add a mhbuild MIME composition file for each.
      */
 
+    if ((fp = fopen (p = etcpath ("mhn.defaults"), "r"))) {
+    	readconfig ((struct node **) NULL, fp, p, 0);
+	fclose(fp);
+    }
+
     rewind(draft_file);
 
     while (get_line() != EOF && *field != '\0' && *field != '-') {
@@ -669,7 +675,7 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
 
     time (&clock);
     snprintf (msgid, sizeof(msgid), "<%d.%ld@%s>",
-		(int) getpid(), (long) clock, LocalName());
+		(int) getpid(), (long) clock, LocalName(1));
 
     fseek (in, start, SEEK_SET);
     for (partno = 1; partno <= nparts; partno++) {