X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhpath.c;h=31e0722e99b0da36c3775474e00eb88ea5b7018c;hp=2281ba0ed16aba1908ef9146b0f647803dc92223;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=097c84b61603c4a4c5837f3dcc09c30a1e751702

diff --git a/uip/mhpath.c b/uip/mhpath.c
index 2281ba0..31e0722 100644
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -8,15 +8,20 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <locale.h>
+#include <sysexits.h>
 
 static struct swit switches[] = {
 #define VERSIONSW 0
-	{ "version", 0 },
+	{ "Version", 0 },
 #define HELPSW  1
 	{ "help", 0 },
 	{ NULL, 0 }
 };
 
+char *version=VERSION;
+
 int
 main(int argc, char **argv)
 {
@@ -27,9 +32,7 @@ main(int argc, char **argv)
 	struct msgs_array msgs = { 0, 0, NULL };
 	struct msgs *mp;
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -44,70 +47,81 @@ 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);
+				exit(EX_USAGE);
+			case UNKWNSW:
+				adios(EX_USAGE, NULL, "-%s unknown", cp);
+
+			case HELPSW:
+				snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
+				print_help(buf, switches, 1);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
+			case VERSIONSW:
+				print_version(invo_name);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 			}
 		}
 		if (*cp == '+' || *cp == '@') {
-			if (folder)
-				adios(NULL, "only one folder at a time!");
-			else
-				folder = pluspath(cp);
-		} else
+			if (folder) {
+				adios(EX_USAGE, NULL, "only one folder at a time!");
+			} else {
+				folder = mh_xstrdup(expandfol(cp));
+			}
+		} else {
 			app_msgarg(&msgs, cp);
+		}
 	}
 
-	if (!context_find("path"))
-		free(path("./", TFOLDER));
-
 	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) {
 		printf("%s\n", maildir);
-		done(0);
+		exit(EX_OK);
 	}
 
 	if (chdir(maildir) == NOTOK)
-		adios(maildir, "unable to change directory to");
+		adios(EX_OSERR, maildir, "unable to change directory to");
 
 	/* read folder and create message structure */
 	if (!(mp = folder_read(folder)))
-		adios(NULL, "unable to read folder %s", folder);
+		adios(EX_IOERR, NULL, "unable to read folder %s", folder);
 
 	/*
 	** 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.
 	*/
 	if (mp->hghmsg >= mp->hghoff) {
-		if (!(mp = folder_realloc(mp, 1, mp->hghmsg + 10)))
-			adios(NULL, "unable to allocate folder storage");
+		if (!(mp = folder_realloc(mp, 1, mp->hghmsg + 10))) {
+			adios(EX_OSERR, NULL, "unable to allocate folder storage");
+		}
 	} else if (mp->lowoff > 1) {
-		if (!(mp = folder_realloc(mp, 1, mp->hghoff)))
-			adios(NULL, "unable to allocate folder storage");
+		if (!(mp = folder_realloc(mp, 1, mp->hghoff))) {
+			adios(EX_OSERR, NULL, "unable to allocate folder storage");
+		}
 	}
+	/*
+	** TODO: As folder_realloc() checks itself if the realloc
+	** really is necessary, 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++)
-		if (!m_convert(mp, msgs.msgs[i]))
-			done(1);
+	for (i = 0; i < msgs.size; i++) {
+		if (!m_convert(mp, msgs.msgs[i])) {
+			exit(EX_SOFTWARE);
+		}
+	}
 
 	seq_setprev(mp);  /* set the previous-sequence */
 
@@ -119,6 +133,5 @@ main(int argc, char **argv)
 	seq_save(mp);  /* synchronize message sequences */
 	context_save();  /* save the context file */
 	folder_free(mp);  /* free folder/message structure */
-	done(0);
-	return 1;
+	return EX_OK;
 }