X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fforw.c;h=666228b73d866e3be398417df7e6c7bd03765c01;hb=5048c3273f8780b3d73e81d0ea5b434f53a83f9f;hp=9ad2877119e9105686f07c350952fa539fb5bfb1;hpb=714b5c530ece27ea2835a313013f5b770163403c;p=mmh

diff --git a/uip/forw.c b/uip/forw.c
index 9ad2877..666228b 100644
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -109,7 +109,7 @@ main(int argc, char **argv)
 #ifdef LOCALE
 	setlocale(LC_ALL, "");
 #endif
-	invo_name = r1bindex(argv[0], '/');
+	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
 	context_read();
@@ -241,8 +241,6 @@ main(int argc, char **argv)
 
 	cwd = getcpy(pwd());
 
-	if (!context_find("path"))
-		free(path("./", TFOLDER));
 	if (file && (msgp || folder))
 		adios(NULL, "can't mix files and folders/msgs");
 
@@ -265,7 +263,7 @@ main(int argc, char **argv)
 		if (!msgp)
 			msgs[msgp++] = "cur";
 		if (!folder)
-			folder = getfolder(1);
+			folder = getfolder(FCUR);
 		maildir = m_maildir(folder);
 
 		if (chdir(maildir) == NOTOK)
@@ -385,7 +383,7 @@ mhl_draft(int out, char *digest, int volume, int issue,
 	if (pipe(pd) == NOTOK)
 		adios("pipe", "unable to create");
 
-	vec[0] = r1bindex(mhlproc, '/');
+	vec[0] = mhbasename(mhlproc);
 
 	for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
 		sleep(5);