X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fconflict.c;h=3670e8e73cd5d29dcb548944865f72919779e580;hp=4251ab2d689a5900eb6c49c6bdcefbe060d50e25;hb=5b92ee6942b9b466914f5faa5fa4c00a2ebc6d35;hpb=1c6fe69a6025e8249c7ed30af0c2ebe9ff9da4c3

diff --git a/uip/conflict.c b/uip/conflict.c
index 4251ab2..3670e8e 100644
--- a/uip/conflict.c
+++ b/uip/conflict.c
@@ -9,7 +9,6 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/aliasbr.h>
-#include <h/mts.h>
 #include <h/utils.h>
 #include <grp.h>
 #include <pwd.h>
@@ -74,7 +73,6 @@ main(int argc, char **argv)
 	if (context_foil(NULL) == -1)
 		done(1);
 
-	mts_init(invo_name);
 	arguments = getarguments(invo_name, argc, argv, 0);
 	argp = arguments;
 
@@ -283,10 +281,7 @@ maildrops(void)
 {
 	register int i;
 
-	if (mmdfldir && *mmdfldir)
-		mdrop(mmdfldir);
-	if (uucpldir && *uucpldir)
-		mdrop(uucpldir);
+	mdrop(mailspool);
 	for (i = 0; dirs[i]; i++)
 		mdrop(dirs[i]);
 }
@@ -357,10 +352,10 @@ setup(void)
 					dup2(fd, 1);
 					close(fd);
 				}
-			execlp(mailproc, mhbasename(mailproc),
+			execlp("mhmail", "mhmail",
 					mail, "-subject", invo_name,
 					NULL);
-			adios(mailproc, "unable to exec ");
+			adios("mhmail", "unable to exec ");
 
 		default:
 			close(pd[0]);