X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Frefile.c;h=690b55b11d2f476a6416768efab68825872bd666;hb=5048c3273f8780b3d73e81d0ea5b434f53a83f9f;hp=b24e42ebf12b777cd3aa49f9e6ea628a10d095d4;hpb=714b5c530ece27ea2835a313013f5b770163403c;p=mmh

diff --git a/uip/refile.c b/uip/refile.c
index b24e42e..690b55b 100644
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -73,7 +73,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();
@@ -128,10 +128,7 @@ main(int argc, char **argv)
 				if (!(cp = *argp++) || *cp == '-')
 					adios(NULL, "missing argument to %s",
 							argp[-2]);
-				folder = path(*cp == '+' || *cp == '@' ?
-						cp + 1 : cp,
-						*cp != '@' ?
-						TFOLDER : TSUBCWF);
+				folder = pluspath(cp);
 				continue;
 			case FILESW:
 				if (filep > NFOLDERS)
@@ -163,8 +160,6 @@ main(int argc, char **argv)
 				app_msgarg(&msgs, cp);
 	}
 
-	if (!context_find("path"))
-		free(path("./", TFOLDER));
 	if (foldp == 0)
 		adios(NULL, "no folder specified");
 
@@ -192,7 +187,7 @@ main(int argc, char **argv)
 	if (!msgs.size)
 		app_msgarg(&msgs, "cur");
 	if (!folder)
-		folder = getfolder(1);
+		folder = getfolder(FCUR);
 	strncpy(maildir, m_maildir(folder), sizeof(maildir));
 
 	if (chdir(maildir) == NOTOK)
@@ -335,7 +330,7 @@ remove_files(int filep, char **files)
 		files[filep] = NULL;  /* NULL terminate list */
 
 		fflush(stdout);
-		vec[0] = r1bindex(rmmproc, '/');
+		vec[0] = mhbasename(rmmproc);
 		execvp(rmmproc, vec);
 		adios(rmmproc, "unable to exec");
 	}