X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fspost.c;h=369f03e24341150d731ff0df1700bf4ede912597;hp=43d3d10654aa7dd27e4dae06dd511b419e3ae700;hb=412b2e54251ff6e20537f83b95c8ee76ea8c5c40;hpb=8cc6b9bed04847a5675f5eec39938b4e242b0b2d

diff --git a/uip/spost.c b/uip/spost.c
index 43d3d10..369f03e 100644
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -87,6 +87,7 @@ static struct headers NHeaders[] = {
 	{ "Bcc", HADR|HTRY|HBCC, MINV },
 	{ "Message-Id", HBAD, 0 },
 	{ "Fcc", HFCC, 0 },
+	{ "Envelope-From", HIGN, 0 },
 	{ NULL, 0, 0 }
 };
 
@@ -103,6 +104,7 @@ static struct headers RHeaders[] = {
 	{ "Resent-Fcc", HFCC, 0 },
 	{ "Reply-To", HADR, 0 },
 	{ "Fcc", HIGN, 0 },
+	{ "Envelope-From", HIGN, 0 },
 	{ NULL, 0, 0 }
 };
 
@@ -477,7 +479,7 @@ finish_headers(FILE *out)
 	char *resentstr = (msgstate == resent) ? "Resent-" : "";
 
 	if (!(msgflags & MDAT)) {
-		fprintf(out, "%sDate: %s\n", resentstr, dtimenow(0));
+		fprintf(out, "%sDate: %s\n", resentstr, dtimenow());
 	}
 
 	strncpy(from, getusername(), sizeof(from));
@@ -652,12 +654,12 @@ fcc(char *file, char *folders)
 				folders);
 		fflush(stdout);
 	}
-	if (strlen(fileproc)+strlen(file)+strlen(folders)+100 > sizeof cmd) {
+	if (100+strlen(file)+strlen(folders) > sizeof cmd) {
 		adios(NULL, "Too much Fcc data");
 	}
 	/* hack: read from /dev/null and refile(1) won't question us */
-	snprintf(cmd, sizeof cmd, "</dev/null %s -link -file %s %s",
-			fileproc, file, folders);
+	snprintf(cmd, sizeof cmd, "</dev/null refile -link -file '%s' %s",
+			file, folders);
 	status = system(cmd);
 	if (status == -1) {
 		fprintf(stderr, "Skipped %sFcc %s: unable to system().\n",