X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Ffolder.c;h=e21910969b3375143a5b9e688b113d22056351bc;hb=f12a3e5036a986f579b80861f4421bcb86f84cee;hp=4fa9424bd3ef15c98dc0e50dd232c15ac1cab5ab;hpb=097c84b61603c4a4c5837f3dcc09c30a1e751702;p=mmh

diff --git a/uip/folder.c b/uip/folder.c
index 4fa9424..e219109 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -241,7 +241,7 @@ main(int argc, char **argv)
 			if (argfolder)
 				adios(NULL, "only one folder at a time!");
 			else
-				argfolder = pluspath(cp);
+				argfolder = getcpy(expandfol(cp));
 		} else {
 			if (msg)
 				adios(NULL, "only one (current) message at a time!");
@@ -250,9 +250,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	if (!context_find("path"))
-		free(path("./", TFOLDER));
-	nmhdir = concat(m_maildir(""), "/", NULL);
+	nmhdir = concat(toabsdir("+"), "/", NULL);
 
 	/*
 	** If we aren't working with the folder stack
@@ -273,15 +271,15 @@ main(int argc, char **argv)
 			} else {
 				adios(NULL, "no other folder");
 			}
-			for (cp = getcpy(getfolder(FCUR)); *ap; ap++)
+			for (cp = getcpy(getcurfol()); *ap; ap++)
 				cp = add(*ap, add(" ", cp));
 			free(dp);
 			context_replace(stack, cp);  /* update folder stack */
 		} else {
 			/* update folder stack */
 			context_replace(stack, (cp = context_find (stack)) ?
-					concat(getfolder(FCUR), " ", cp, NULL) :
-					getcpy(getfolder(FCUR)));
+					concat(getcurfol(), " ", cp, NULL) :
+					getcpy(getcurfol()));
 		}
 	}
 
@@ -309,18 +307,18 @@ main(int argc, char **argv)
 		free(dp);
 	}
 	if (pushsw || popsw) {
-		cp = m_maildir(argfolder);
+		cp = toabsdir(argfolder);
 		if (access(cp, F_OK) == NOTOK)
 			adios(cp, "unable to find folder");
 		/* update current folder   */
-		context_replace(pfolder, argfolder);
+		context_replace(curfolder, argfolder);
 		context_save();  /* save the context file   */
 		argfolder = NULL;
 	}
 
 	/* Listing the folder stack */
 	if (listsw) {
-		printf("%s", argfolder ? argfolder : getfolder(FCUR));
+		printf("%s", argfolder ? argfolder : getcurfol());
 		if ((cp = context_find(stack))) {
 			dp = getcpy(cp);
 			for (ap = brkstring(dp, " ", "\n"); *ap; ap++)
@@ -354,14 +352,14 @@ main(int argc, char **argv)
 			if (msg)
 				admonish(NULL, "no folder given for message %s", msg);
 			readonly_folders(); /* do any readonly folders */
-			strncpy(folder, (cp = context_find(pfolder)) ?
+			strncpy(folder, (cp = context_find(curfolder)) ?
 					cp : "", sizeof(folder));
 			crawl_folders(".", get_folder_info_callback, NULL);
 		} else {
 			strncpy(folder, argfolder, sizeof(folder));
 			if (get_folder_info(argfolder, msg)) {
 				/* update current folder */
-				context_replace(pfolder, argfolder);
+				context_replace(curfolder, argfolder);
 				context_save();
 			}
 			/*
@@ -373,18 +371,18 @@ main(int argc, char **argv)
 						NULL);
 		}
 	} else {
-		strncpy(folder, argfolder ? argfolder : getfolder (1),
+		strncpy(folder, argfolder ? argfolder : getcurfol(),
 				sizeof(folder));
 
 		/*
 		** Check if folder exists.  If not, then see if
 		** we should create it, or just exit.
 		*/
-		create_folder(m_maildir(folder), fcreat, done);
+		create_folder(toabsdir(folder), fcreat, done);
 
 		if (get_folder_info(folder, msg) && argfolder) {
 			/* update current folder */
-			context_replace(pfolder, argfolder);
+			context_replace(curfolder, argfolder);
 			}
 	}