X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fcomp.c;h=676ff236cecdac0de39435f1142842892abed489;hb=682962d94b21e120c78a52a8bdcb6aa994330a14;hp=83b002a3e08439dd08809f4b31e38ea059f5a745;hpb=714b5c530ece27ea2835a313013f5b770163403c;p=mmh

diff --git a/uip/comp.c b/uip/comp.c
index 83b002a..676ff23 100644
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -64,7 +64,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();
@@ -124,7 +124,7 @@ main(int argc, char **argv)
 			if (folder)
 				adios(NULL, "only one folder at a time!");
 			else
-				folder = pluspath(cp);
+				folder = getcpy(expandfol(cp));
 		} else {
 			if (msg)
 				adios(NULL, "only one message at a time!");
@@ -135,9 +135,6 @@ main(int argc, char **argv)
 
 	cwd = getcpy(pwd());
 
-	if (!context_find("path"))
-		free(path("./", TFOLDER));
-
 	if (form && (folder || msg))
 			adios(NULL, "can't mix forms and folders/msgs");
 
@@ -148,8 +145,8 @@ main(int argc, char **argv)
 		if (!msg)
 			msg = "cur";
 		if (!folder)
-			folder = getfolder(1);
-		maildir = m_maildir(folder);
+			folder = getcurfol();
+		maildir = toabsdir(folder);
 
 		if (chdir(maildir) == NOTOK)
 			adios(maildir, "unable to change directory to");