X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fconflict.c;h=30ff189bf5388c2db75fc196510068f17ad2e441;hb=8e5be81f784682822f5e868c1bf3c8624682bd23;hp=909bbc8fd9aa5bc5321f6248560ea855353e632e;hpb=714b5c530ece27ea2835a313013f5b770163403c;p=mmh

diff --git a/uip/conflict.c b/uip/conflict.c
index 909bbc8..30ff189 100644
--- 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 ");