Hardcoded mhmail instead of mailproc.

[mmh] / uip / conflict.c

diff --git a/uip/conflict.c b/uip/conflict.c
index 4251ab2..3670e8e 100644 (file)
--- 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]);