X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frefile.c;h=b85186a3b06d0d460c61e4e2c8a3f5d927fc8fd3;hp=a79e8be8128f195742e40e703a587adc9cfff4c3;hb=682962d94b21e120c78a52a8bdcb6aa994330a14;hpb=240013872c392fe644bd4f79382d9f5314b4ea60

diff --git a/uip/refile.c b/uip/refile.c
index a79e8be..b85186a 100644
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -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");
 
@@ -192,8 +186,8 @@ main(int argc, char **argv)
 	if (!msgs.size)
 		app_msgarg(&msgs, "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);