X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fsend.c;h=a2e9932956805c47f65574703617c50f037c1d60;hb=12fc1bc3b016c93fa00712de76a286c09dc1ee39;hp=a735c6777e8d11ddfb136452a4c792b00b8921e5;hpb=5f08476e3bc5c134ce57d924b01d1c1fcacd53db;p=mmh

diff --git a/uip/send.c b/uip/send.c
index a735c67..a2e9932 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -16,16 +16,10 @@
 #include <h/tws.h>
 #include <h/utils.h>
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 
 int debugsw = 0;  /* global */
 int forwsw  = 1;
@@ -630,9 +624,9 @@ make_mime_composition_file_entry(char *file_name)
 		adios(NULL, "unable to access file `%s'", file_name);
 	}
 
-	fprintf(composition_file, "#%s; name=\"%s\" <>{attachment}",
-		content_type,
-		(!(cp = strrchr(file_name, '/'))) ? file_name : cp + 1);
+	cp = (!(cp = strrchr(file_name, '/'))) ? file_name : cp + 1;
+	fprintf(composition_file, "#%s; name=\"%s\" <> [%s] {attachment}",
+			content_type, cp, cp);
 
 	fprintf(composition_file, " %s\n", file_name);