Removed the global alias file

[mmh] / uip / conflict.c

diff --git a/uip/conflict.c b/uip/conflict.c
index 909bbc8..30ff189 100644 (file)
--- a/uip/conflict.c
+++ b/uip/conflict.c
@@ -68,7 +68,7 @@ main(int argc, char **argv)
 #ifdef LOCALE
        setlocale(LC_ALL, "");
 #endif
-       invo_name = r1bindex(argv[0], '/');
+       invo_name = mhbasename(argv[0]);
 
        /* foil search of user profile/context */
        if (context_foil(NULL) == -1)
@@ -116,8 +116,6 @@ main(int argc, char **argv)
                akv[akp++] = cp;
        }
 
-       if (akp == 0)
-               akv[akp++] = AliasFile;
        if (!homehead)
                init_pw();
        if (!mail)
@@ -360,7 +358,7 @@ setup(void)
                                                dup2(fd, 1);
                                                close(fd);
                                        }
-                               execlp(mailproc, r1bindex (mailproc, '/'),
+                               execlp(mailproc, mhbasename(mailproc),
                                                mail, "-subject", invo_name,
                                                NULL);
                                adios(mailproc, "unable to exec ");