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

diff --git a/uip/refile.c b/uip/refile.c
index b24e42e..e699a14 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 = getcpy(expandfol(cp));
 				continue;
 			case FILESW:
 				if (filep > NFOLDERS)
@@ -140,7 +137,7 @@ main(int argc, char **argv)
 				if (!(cp = *argp++) || *cp == '-')
 					adios(NULL, "missing argument to %s",
 							argp[-2]);
-				files[filep++] = path(cp, TFILE);
+				files[filep++] = getcpy(expanddir(cp));
 				continue;
 
 			case RPROCSW:
@@ -157,14 +154,11 @@ main(int argc, char **argv)
 			if (foldp > NFOLDERS)
 				adios(NULL, "only %d folders allowed!",
 						NFOLDERS);
-			folders[foldp++].f_name =
-				pluspath(cp);
+			folders[foldp++].f_name = getcpy(expandfol(cp));
 		} else
-				app_msgarg(&msgs, cp);
+			app_msgarg(&msgs, cp);
 	}
 
-	if (!context_find("path"))
-		free(path("./", TFOLDER));
 	if (foldp == 0)
 		adios(NULL, "no folder specified");
 
@@ -190,10 +184,10 @@ main(int argc, char **argv)
 	}
 
 	if (!msgs.size)
-		app_msgarg(&msgs, "cur");
+		app_msgarg(&msgs, seq_cur);
 	if (!folder)
-		folder = getfolder(1);
-	strncpy(maildir, m_maildir(folder), sizeof(maildir));
+		folder = getcurfol();
+	strncpy(maildir, toabsdir(folder), sizeof(maildir));
 
 	if (chdir(maildir) == NOTOK)
 		adios(maildir, "unable to change directory to");
@@ -237,7 +231,7 @@ main(int argc, char **argv)
 	** directory.  This should be moved to folder_delmsgs().
 	*/
 	if (rmmproc) {
-		context_replace(pfolder, folder);
+		context_replace(curfolder, folder);
 		context_save();
 		fflush(stdout);
 	}
@@ -259,7 +253,7 @@ main(int argc, char **argv)
 		seq_setcur(mp, mp->hghsel);
 	seq_save(mp);  /* synchronize message sequences */
 
-	context_replace(pfolder, folder);  /* update current folder   */
+	context_replace(curfolder, folder);  /* update current folder   */
 	context_save();  /* save the context file   */
 	folder_free(mp);  /* free folder structure   */
 	done(0);
@@ -280,8 +274,8 @@ opnfolds(struct st_fold *folders, int nfolders)
 	register struct msgs *mp;
 
 	for (fp = folders, ep = folders + nfolders; fp < ep; fp++) {
-		chdir(m_maildir(""));
-		strncpy(nmaildir, m_maildir(fp->f_name), sizeof(nmaildir));
+		chdir(toabsdir("+"));
+		strncpy(nmaildir, toabsdir(fp->f_name), sizeof(nmaildir));
 
 		create_folder(nmaildir, 0, done);
 
@@ -335,7 +329,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");
 	}