X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsortm.c;fp=uip%2Fsortm.c;h=802e010aa5f6b977114041b0b3630844afa077bf;hp=734b63b9ecb9e8cacf37269aa72aba5a59d4999a;hb=cf1205b5cbea2f0cd6ea710ec16c637df85b647c;hpb=d254c5e2ad008f26d5fda43c3f24f0a711c7e851

diff --git a/uip/sortm.c b/uip/sortm.c
index 734b63b..802e010 100644
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -13,6 +13,7 @@
 #include <ctype.h>
 #include <sys/stat.h>
 #include <locale.h>
+#include <sysexits.h>
 
 #ifdef HAVE_SYS_PARAM_H
 # include <sys/param.h>
@@ -98,31 +99,31 @@ main(int argc, char **argv)
 			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
 				ambigsw(cp, switches);
-				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] [msgs] [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 DATESW:
 				if (datesw)
-					adios(NULL, "only one date field at a time");
+					adios(EX_USAGE, NULL, "only one date field at a time");
 				if (!(datesw = *argp++) || *datesw == '-')
-					adios(NULL, "missing argument to %s",
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
 				continue;
 
 			case TEXTSW:
 				if (subjsort)
-					adios(NULL, "only one text field at a time");
+					adios(EX_USAGE, NULL, "only one text field at a time");
 				if (!(subjsort = *argp++) || *subjsort == '-')
-					adios(NULL, "missing argument to %s",
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
 				continue;
 
@@ -132,7 +133,7 @@ main(int argc, char **argv)
 
 			case LIMSW:
 				if (!(cp = *argp++) || *cp == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
+						adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]);
 				while (*cp == '0')
 					cp++;  /* skip any leading zeros */
 				if (!*cp) {  /* hit end of string */
@@ -140,7 +141,7 @@ main(int argc, char **argv)
 					continue;
 				}
 				if (!isdigit(*cp) || !(datelimit = atoi(cp)))
-					adios(NULL, "impossible limit %s", cp);
+					adios(EX_USAGE, NULL, "impossible limit %s", cp);
 				datelimit *= 60*60*24;
 				continue;
 			case NLIMSW:
@@ -158,7 +159,7 @@ main(int argc, char **argv)
 		}
 		if (*cp == '+' || *cp == '@') {
 			if (folder)
-				adios(NULL, "only one folder at a time!");
+				adios(EX_USAGE, NULL, "only one folder at a time!");
 			else
 				folder = getcpy(expandfol(cp));
 		} else
@@ -174,24 +175,24 @@ main(int argc, char **argv)
 	maildir = toabsdir(folder);
 
 	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);
 
 	/* check for empty folder */
 	if (mp->nummsg == 0)
-		adios(NULL, "no messages in %s", folder);
+		adios(EX_DATAERR, NULL, "no messages in %s", folder);
 
 	/* parse all the message ranges/sequences and set SELECTED */
 	for (msgnum = 0; msgnum < msgs.size; msgnum++)
 		if (!m_convert(mp, msgs.msgs[msgnum]))
-			exit(1);
+			exit(EX_USAGE);
 	seq_setprev(mp);  /* set the previous sequence */
 
 	if ((nmsgs = read_hdrs(mp, datesw)) <= 0)
-		adios(NULL, "no messages to sort");
+		adios(EX_DATAERR, NULL, "no messages to sort");
 
 	/*
 	** sort a list of pointers to our "messages to be sorted".
@@ -236,7 +237,7 @@ main(int argc, char **argv)
 		*/
 		il = (struct smsg ***) calloc(mp->hghsel+1, sizeof(*il));
 		if (! il)
-			adios(NULL, "couldn't allocate msg list");
+			adios(EX_OSERR, NULL, "couldn't allocate msg list");
 		for (i = 0; i < nmsgs; i++)
 			il[slist[i]->s_msg] = &slist[i];
 		/*
@@ -297,7 +298,7 @@ read_hdrs(struct msgs *mp, char *datesw)
 	smsgs = (struct smsg *) calloc((size_t) (mp->hghsel - mp->lowsel + 2),
 			sizeof(*smsgs));
 	if (smsgs == NULL)
-		adios(NULL, "unable to allocate sort storage");
+		adios(EX_OSERR, NULL, "unable to allocate sort storage");
 
 	s = smsgs;
 	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
@@ -381,7 +382,7 @@ get_fields(char *datesw, int msg, struct smsg *smsg)
 			return (0);
 
 		default:
-			adios(NULL, "internal error -- you lose");
+			adios(EX_SOFTWARE, NULL, "internal error -- you lose");
 		}
 		break;
 	}
@@ -509,7 +510,7 @@ rename_chain(struct msgs *mp, struct smsg **mlist, int msg, int endmsg)
 		ext_hook("ref-hook", oldname, newbuf);
 
 		if (rename(oldname, newname) == NOTOK)
-			adios(newname, "unable to rename %s to", oldname);
+			adios(EX_IOERR, newname, "unable to rename %s to", oldname);
 
 		copy_msg_flags(mp, new, old);
 		if (mp->curmsg == old)
@@ -568,7 +569,7 @@ rename_msgs(struct msgs *mp, struct smsg **mlist)
 		ext_hook("ref-hook", f1, newbuf);
 
 		if (rename(f1, tmpfil) == NOTOK)
-			adios(tmpfil, "unable to rename %s to ", f1);
+			adios(EX_IOERR, tmpfil, "unable to rename %s to ", f1);
 
 		get_msg_flags(mp, &tmpset, old);
 
@@ -583,7 +584,7 @@ rename_msgs(struct msgs *mp, struct smsg **mlist)
 		ext_hook("ref-hook", newbuf, f1);
 
 		if (rename(tmpfil, m_name(new)) == NOTOK)
-			adios(m_name(new), "unable to rename %s to", tmpfil);
+			adios(EX_IOERR, m_name(new), "unable to rename %s to", tmpfil);
 
 		set_msg_flags(mp, &tmpset, new);
 		mp->msgflags |= SEQMOD;