X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fdist.c;h=07107127353ee4297d697bd93fcc04fbee559520;hp=21c67028f30a7303fa35232ef08d3fc80075c837;hb=cf1205b5cbea2f0cd6ea710ec16c637df85b647c;hpb=d254c5e2ad008f26d5fda43c3f24f0a711c7e851

diff --git a/uip/dist.c b/uip/dist.c
index 21c6702..0710712 100644
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -11,6 +11,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <locale.h>
+#include <sysexits.h>
 
 static struct swit switches[] = {
 #define ANNOSW  0
@@ -57,18 +58,18 @@ main(int argc, char **argv)
 			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
 				ambigsw(cp, switches);
-				/* sysexits.h EX_USAGE*/
-				exit(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);
-				exit(0);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
+
 			case VERSIONSW:
 				print_version(invo_name);
-				exit(0);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 
 			case ANNOSW:
 				anot++;
@@ -79,76 +80,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
+			if (folder) {
+				adios(EX_USAGE, NULL, "only one folder at a time!");
+			} else {
 				folder = getcpy(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());
 
 	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))
-		/* sysexits.h EX_USAGE*/
-		exit(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");
+	if ((in = open(msgnam, O_RDONLY)) == NOTOK) {
+		adios(EX_IOERR, msgnam, "unable to open message");
+	}
 
 	context_replace(curfolder, folder);
 	seq_setcur(mp, mp->lowsel);
@@ -156,6 +169,5 @@ main(int argc, char **argv)
 	context_save();
 
 	what_now(ed, NOUSE, drft, msgnam, 1, mp, anot ? "Resent" : NULL, cwd);
-	/*sysexits.h EX_SOFTWARE*/
-	return 1;
+	return EX_SOFTWARE;
 }