X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhpath.c;h=605d13c37a70abaaa3218bee6cb1f8648b5d9328;hp=eb3b61829959dbbffeecae465a34a19b2a0c9795;hb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;hpb=3d78b9c80a95f4e7885ed607018f9b1b9be559b4

diff --git a/uip/mhpath.c b/uip/mhpath.c
index eb3b618..605d13c 100644
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -11,7 +11,7 @@
 
 static struct swit switches[] = {
 #define VERSIONSW 0
-	{ "version", 0 },
+	{ "Version", 0 },
 #define HELPSW  1
 	{ "help", 0 },
 	{ NULL, 0 }
@@ -44,33 +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 (!folder)
-		folder = getfolder(FCUR);
-	maildir = m_maildir(folder);
+		folder = getcurfol();
+	maildir = toabsdir(folder);
 
 	/* If no messages are given, print folder pathname */
 	if (!msgs.size) {
@@ -87,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.
 	*/
@@ -98,8 +98,16 @@ main(int argc, char **argv)
 		if (!(mp = folder_realloc(mp, 1, mp->hghoff)))
 			adios(NULL, "unable to allocate folder storage");
 	}
+	/*
+	** TODO: As folder_realloc() checks itself if the realloc
+	** really is necesary, why don't we then:
+	**    if (!(mp = folder_realloc (mp, 1, mp->hghmsg+1)))
+	**        adios (NULL, "unable to allocate folder storage");
+	** ? This at least appears most clear to me. -- meillo
+	*/
+
 
-	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++)