X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Frefile.c;h=e699a1440c06563a03b76480167bdaeb08df1a8f;hb=84c6039eb7226c0ba0a8f708205e33d10950d2ae;hp=690b55b11d2f476a6416768efab68825872bd666;hpb=3d78b9c80a95f4e7885ed607018f9b1b9be559b4;p=mmh

diff --git a/uip/refile.c b/uip/refile.c
index 690b55b..e699a14 100644
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -128,7 +128,7 @@ main(int argc, char **argv)
 				if (!(cp = *argp++) || *cp == '-')
 					adios(NULL, "missing argument to %s",
 							argp[-2]);
-				folder = pluspath(cp);
+				folder = getcpy(expandfol(cp));
 				continue;
 			case FILESW:
 				if (filep > NFOLDERS)
@@ -137,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:
@@ -154,10 +154,9 @@ 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 (foldp == 0)
@@ -185,10 +184,10 @@ main(int argc, char **argv)
 	}
 
 	if (!msgs.size)
-		app_msgarg(&msgs, "cur");
+		app_msgarg(&msgs, seq_cur);
 	if (!folder)
-		folder = getfolder(FCUR);
-	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");
@@ -232,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);
 	}
@@ -254,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);
@@ -275,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);