X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Finc.c;h=762a858d6ad59bf9c16e656996fa8f4e6846cac0;hp=6a756d9855f24302836557e3acc570bad53ab6a1;hb=a0b824f146a18ad99633addede9e81a470d4cb59;hpb=a7771fd2e83d64228fb675749fc936151249dbd3

diff --git a/uip/inc.c b/uip/inc.c
index 6a756d9..762a858 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -34,7 +34,6 @@
 #include <h/scansbr.h>
 #include <h/signals.h>
 #include <h/tws.h>
-#include <h/mts.h>
 #include <errno.h>
 #include <signal.h>
 
@@ -121,8 +120,6 @@ static FILE *in;
 /*
 ** prototypes
 */
-char *map_name(char *);
-
 static void inc_done(int) NORETURN;
 
 
@@ -168,7 +165,6 @@ main(int argc, char **argv)
 	/* read user profile/context */
 	context_read();
 
-	mts_init(invo_name);
 	arguments = getarguments(invo_name, argc, argv, 1);
 	argp = arguments;
 
@@ -290,7 +286,7 @@ main(int argc, char **argv)
 	else if ((newmail = context_find("maildrop")) && *newmail)
 		newmail = toabsdir(newmail);
 	else {
-		newmail = concat(MAILDIR, "/", MAILFIL, NULL);
+		newmail = concat(mailspool, "/", getusername(), NULL);
 	}
 	if (stat(newmail, &s1) == NOTOK || s1.st_size == 0)
 		adios(NULL, "no mail to incorporate");
@@ -377,7 +373,7 @@ main(int argc, char **argv)
 #endif /* MHE */
 
 	/* Get new format string */
-	nfs = new_fs(form, format, FORMAT);
+	nfs = new_fs(form, format, NULL, FORMAT);
 
 	if (noisy) {
 		printf("Incorporating new mail into %s...\n\n", folder);
@@ -497,7 +493,6 @@ main(int argc, char **argv)
 				close(newfd);
 			else
 				admonish(newmail, "error zero'ing");
-			unlink(map_name(newmail));
 		}
 	} else if (noisy) {
 		printf("%s not zero'd\n", newmail);