X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhpath.c;h=69ecaf2db4d21e72307520d03d90badff3f958f4;hb=0f56dec07e0eda5042276a5e65cb51ea95c23ff9;hp=6f53aba6a4c4ac82ad9fe59b0509d6b418106a30;hpb=714b5c530ece27ea2835a313013f5b770163403c;p=mmh

diff --git a/uip/mhpath.c b/uip/mhpath.c
index 6f53aba..69ecaf2 100644
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -30,7 +30,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();
@@ -44,36 +44,33 @@ main(int argc, char **argv)
 	while ((cp = *argp++)) {
 		if (*cp == '-') {
 			switch (smatch(++cp, switches)) {
-				case AMBIGSW:
-					ambigsw(cp, switches);
-					done(1);
-				case UNKWNSW:
-					adios(NULL, "-%s unknown", cp);
-
-				case HELPSW:
-					snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
-					print_help(buf, switches, 1);
-					done(1);
-				case VERSIONSW:
-					print_version(invo_name);
-					done(1);
+			case AMBIGSW:
+				ambigsw(cp, switches);
+				done(1);
+			case UNKWNSW:
+				adios(NULL, "-%s unknown", cp);
+
+			case HELPSW:
+				snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
+				print_help(buf, switches, 1);
+				done(1);
+			case VERSIONSW:
+				print_version(invo_name);
+				done(1);
 			}
 		}
 		if (*cp == '+' || *cp == '@') {
 			if (folder)
 				adios(NULL, "only one folder at a time!");
 			else
-				folder = pluspath(cp);
+				folder = getcpy(expandfol(cp));
 		} else
 			app_msgarg(&msgs, cp);
 	}
 
-	if (!context_find("path"))
-		free(path("./", TFOLDER));
-
 	if (!folder)
-		folder = getfolder(1);
-	maildir = m_maildir(folder);
+		folder = getcurfol();
+	maildir = toabsdir(folder);
 
 	/* If no messages are given, print folder pathname */
 	if (!msgs.size) {
@@ -90,7 +87,7 @@ main(int argc, char **argv)
 
 	/*
 	** We need to make sure there is message status space
-	** for all the message numbers from 1 to "new" since
+	** for all the message numbers from 1 to one beyond last since
 	** mhpath can select empty slots.  If we are adding
 	** space at the end, we go ahead and add 10 slots.
 	*/
@@ -102,7 +99,7 @@ main(int argc, char **argv)
 			adios(NULL, "unable to allocate folder storage");
 	}
 
-	mp->msgflags |= ALLOW_NEW;  /* allow the "new" sequence */
+	mp->msgflags |= ALLOW_BEYOND;  /* allow the beyond sequence */
 
 	/* parse all the message ranges/sequences and set SELECTED */
 	for (i = 0; i < msgs.size; i++)