X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhlist.c;h=7056db5f7618f71c7cfd22c8840c1a8996d914e0;hp=ceb9336cc09b40d0c6f45f3470880d68357280e8;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=2abb9a7cfb0930e27062088734d306e7d78e4cc2

diff --git a/uip/mhlist.c b/uip/mhlist.c
index ceb9336..7056db5 100644
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -18,6 +18,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <locale.h>
+#include <sysexits.h>
 
 static struct swit switches[] = {
 #define VERBSW  0
@@ -39,6 +40,7 @@ static struct swit switches[] = {
 	{ NULL, 0 }
 };
 
+char *version=VERSION;
 
 /* mhparse.c */
 extern char *tmp;  /* directory to place temp files */
@@ -96,7 +98,7 @@ main(int argc, char **argv)
 	CT ct, *ctp;
 
 	if (atexit(freects_done) != 0) {
-		adios(NULL, "atexit failed");
+		adios(EX_OSERR, NULL, "atexit failed");
 	}
 
 	setlocale(LC_ALL, "");
@@ -116,41 +118,41 @@ 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 PARTSW:
 				if (!(cp = *argp++) || *cp == '-')
-					adios(NULL, "missing argument to %s",
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
 				if (npart >= NPARTS)
-					adios(NULL, "too many parts (starting with %s), %d max", cp, NPARTS);
+					adios(EX_USAGE, NULL, "too many parts (starting with %s), %d max", cp, NPARTS);
 				parts[npart++] = cp;
 				continue;
 
 			case TYPESW:
 				if (!(cp = *argp++) || *cp == '-')
-					adios(NULL, "missing argument to %s",
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
 				if (ntype >= NTYPES)
-					adios(NULL, "too many types (starting with %s), %d max", cp, NTYPES);
+					adios(EX_USAGE, NULL, "too many types (starting with %s), %d max", cp, NTYPES);
 				types[ntype++] = cp;
 				continue;
 
 			case FILESW:
 				if (!(cp = *argp++) || (*cp == '-' && cp[1]))
-					adios(NULL, "missing argument to %s",
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
-				file = *cp == '-' ? cp : getcpy(expanddir(cp));
+				file = *cp == '-' ? cp : mh_xstrdup(expanddir(cp));
 				continue;
 
 			case VERBSW:
@@ -166,9 +168,9 @@ 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));
+				folder = mh_xstrdup(expandfol(cp));
 		} else
 			app_msgarg(&msgs, cp);
 	}
@@ -187,17 +189,16 @@ main(int argc, char **argv)
 	if ((cp = context_find(nmhstorage)) && *cp)
 		tmp = concat(cp, "/", invo_name, NULL);
 	else
-		tmp = getcpy(toabsdir(invo_name));
+		tmp = mh_xstrdup(toabsdir(invo_name));
 
 	if (file && msgs.size)
-		adios(NULL, "cannot specify msg and file at same time!");
+		adios(EX_USAGE, NULL, "cannot specify msg and file at same time!");
 
 	/*
 	** check if message is coming from file
 	*/
 	if (file) {
-		if (!(cts = (CT *) calloc((size_t) 2, sizeof(*cts))))
-			adios(NULL, "out of memory");
+		cts = mh_xcalloc(2, sizeof(*cts));
 		ctp = cts;
 
 		if ((ct = parse_mime(file)))
@@ -213,28 +214,25 @@ 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])) {
-				/* sysexits.h EX_USAGE */
-				exit(1);
+				exit(EX_SOFTWARE);
 			}
 		}
 		seq_setprev(mp);  /* set the previous-sequence */
 
-		if (!(cts = (CT *) calloc((size_t) (mp->numsel + 1),
-				sizeof(*cts))))
-			adios(NULL, "out of memory");
+		cts = mh_xcalloc(mp->numsel + 1, sizeof(*cts));
 		ctp = cts;
 
 		for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
@@ -249,7 +247,7 @@ main(int argc, char **argv)
 	}
 
 	if (!*cts)
-		exit(1);
+		exit(EX_SOFTWARE);
 
 	userrs = 1;
 	SIGNAL(SIGQUIT, quitser);
@@ -279,8 +277,7 @@ main(int argc, char **argv)
 	for (ctp = cts; *ctp; ctp++)
 		free_content(*ctp);
 
-	free((char *) cts);
-	cts = NULL;
+	mh_free0(&cts);
 
 	/* If reading from a folder, do some updating */
 	if (mp) {
@@ -290,7 +287,7 @@ main(int argc, char **argv)
 		context_save();  /* save the context file  */
 	}
 
-	return 0;
+	return EX_OK;
 }
 
 
@@ -304,6 +301,6 @@ pipeser(int i)
 		fflush(stderr);
 	}
 
-	exit(1);
+	_exit(EX_IOERR);
 	/* NOTREACHED */
 }