X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fdist.c;h=1d5c3aa4c41b8713c82586a9d4bc58f4db39f1f4;hp=57efc4e3bdbc4cc5d2410b2bd411099d0663f1a1;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=75fca31a5b9d5c1a99c74ab14c94438d8852fba9

diff --git a/uip/dist.c b/uip/dist.c
index 57efc4e..1d5c3aa 100644
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -9,12 +9,15 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <fcntl.h>
+#include <unistd.h>
+#include <locale.h>
+#include <sysexits.h>
 
 static struct swit switches[] = {
 #define ANNOSW  0
 	{ "annotate", 0 },
 #define NANNOSW  1
-	{ "noannotate", 0 },
+	{ "noannotate", 2 },
 #define EDITRSW  2
 	{ "editor editor", 0 },
 #define FORMSW  3
@@ -22,12 +25,13 @@ static struct swit switches[] = {
 #define WHATSW  4
 	{ "whatnowproc program", 0 },
 #define VERSIONSW  5
-	{ "version", 0 },
+	{ "Version", 0 },
 #define HELPSW  6
 	{ "help", 0 },
 	{ NULL, 0 }
 };
 
+char *version=VERSION;
 
 int
 main(int argc, char **argv)
@@ -41,9 +45,7 @@ main(int argc, char **argv)
 	struct msgs *mp = NULL;
 	char *fmtstr;
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -57,17 +59,18 @@ 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] [msg] [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);
 
 			case ANNOSW:
 				anot++;
@@ -78,75 +81,88 @@ main(int argc, char **argv)
 
 			case EDITRSW:
 				if (!(ed = *argp++) || *ed == '-')
-					adios(NULL, "missing argument to %s",
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
 				continue;
 
 			case WHATSW:
-				if (!(whatnowproc = *argp++) || *whatnowproc == '-')
-					adios(NULL, "missing argument to %s",
+				if (!(whatnowproc = *argp++) || *whatnowproc == '-') {
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
+				}
 				continue;
 
 			case FORMSW:
-				if (!(form = *argp++) || *form == '-')
-					adios(NULL, "missing argument to %s",
+				if (!(form = *argp++) || *form == '-') {
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
+				}
 				continue;
 			}
 		}
 		if (*cp == '+' || *cp == '@') {
-			if (folder)
-				adios(NULL, "only one folder at a time!");
-			else
-				folder = getcpy(expandfol(cp));
+			if (folder) {
+				adios(EX_USAGE, NULL, "only one folder at a time!");
+			} else {
+				folder = mh_xstrdup(expandfol(cp));
+			}
 		} else {
-			if (msg)
-				adios(NULL, "only one message at a time!");
-			else
+			if (msg) {
+				adios(EX_USAGE, NULL, "only one message at a time!");
+			} else {
 				msg = cp;
+			}
 		}
 	}
 
-	cwd = getcpy(pwd());
+	cwd = mh_xstrdup(pwd());
 
 	strncpy(drft, m_draft(seq_beyond), sizeof(drft));
-	if ((out = creat(drft, m_gmprot())) == NOTOK)
-		adios(drft, "unable to create");
+	if ((out = creat(drft, m_gmprot())) == NOTOK) {
+		adios(EX_CANTCREAT, drft, "unable to create");
+	}
 
 	fmtstr = new_fs(form, distcomps);
 	if (write(out, fmtstr, strlen(fmtstr)) != (int)strlen(fmtstr)) {
-		adios(drft, "error writing");
+		adios(EX_IOERR, drft, "error writing");
 	}
 	close(out);
 
-	if (!msg)
+	if (!msg) {
 		msg = seq_cur;
-	if (!folder)
+	}
+	if (!folder) {
 		folder = getcurfol();
+	}
 	maildir = toabsdir(folder);
 
-	if (chdir(maildir) == NOTOK)
-		adios(maildir, "unable to change directory to");
+	if (chdir(maildir) == NOTOK) {
+		adios(EX_OSERR, maildir, "unable to change directory to");
+	}
 
-	if (!(mp = folder_read(folder)))
-		adios(NULL, "unable to read folder %s", folder);
+	if (!(mp = folder_read(folder))) {
+		adios(EX_IOERR, NULL, "unable to read folder %s", folder);
+	}
 
 	/* check for empty folder */
-	if (mp->nummsg == 0)
-		adios(NULL, "no messages in %s", folder);
+	if (mp->nummsg == 0) {
+		adios(EX_NOINPUT, NULL, "no messages in %s", folder);
+	}
 
 	/* parse the message range/sequence/name and set SELECTED */
-	if (!m_convert(mp, msg))
-		done(1);
+	if (!m_convert(mp, msg)) {
+		exit(EX_USAGE);
+	}
 	seq_setprev(mp);
 
-	if (mp->numsel > 1)
-		adios(NULL, "only one message at a time!");
+	if (mp->numsel > 1) {
+		adios(EX_USAGE, NULL, "only one message at a time!");
+	}
 
-	msgnam = getcpy(m_name(mp->lowsel));
-	if ((in = open(msgnam, O_RDONLY)) == NOTOK)
-		adios(msgnam, "unable to open message");
+	msgnam = mh_xstrdup(m_name(mp->lowsel));
+	if ((in = open(msgnam, O_RDONLY)) == NOTOK) {
+		adios(EX_IOERR, msgnam, "unable to open message");
+	}
 
 	context_replace(curfolder, folder);
 	seq_setcur(mp, mp->lowsel);
@@ -154,6 +170,5 @@ main(int argc, char **argv)
 	context_save();
 
 	what_now(ed, NOUSE, drft, msgnam, 1, mp, anot ? "Resent" : NULL, cwd);
-	done(1);
-	return 1;
+	return EX_SOFTWARE;
 }