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

diff --git a/uip/mhpath.c b/uip/mhpath.c
index 605d13c..31e0722 100644
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -8,6 +8,9 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <locale.h>
+#include <sysexits.h>
 
 static struct swit switches[] = {
 #define VERSIONSW 0
@@ -17,6 +20,8 @@ static struct swit switches[] = {
 	{ 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 */
@@ -46,26 +49,28 @@ main(int argc, char **argv)
 			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
 				ambigsw(cp, switches);
-				done(1);
+				exit(EX_USAGE);
 			case UNKWNSW:
-				adios(NULL, "-%s unknown", cp);
+				adios(EX_USAGE, NULL, "-%s unknown", cp);
 
 			case HELPSW:
 				snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
 				print_help(buf, switches, 1);
-				done(1);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 			case VERSIONSW:
 				print_version(invo_name);
-				done(1);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 			}
 		}
 		if (*cp == '+' || *cp == '@') {
-			if (folder)
-				adios(NULL, "only one folder at a time!");
-			else
-				folder = getcpy(expandfol(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 (!folder)
@@ -75,15 +80,15 @@ main(int argc, char **argv)
 	/* 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
@@ -92,15 +97,17 @@ main(int argc, char **argv)
 	** 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 necesary, why don't we then:
+	** 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
@@ -110,9 +117,11 @@ main(int argc, char **argv)
 	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 */
 
@@ -124,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;
 }