X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhtest.c;h=d4bf6a6a05b107a4e7e167a42fa520fdffd5ed4a;hp=aa7e411e195c9e313d580ca48219c1a375b7ec70;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=1201af682c2a7e34d4d598e62718306b885a187e

diff --git a/uip/mhtest.c b/uip/mhtest.c
index aa7e411..d4bf6a6 100644
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -15,6 +15,10 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <locale.h>
+#include <sysexits.h>
 
 static struct swit switches[] = {
 #define VERBSW  0
@@ -38,6 +42,7 @@ static struct swit switches[] = {
 	{ NULL, 0 }
 };
 
+char *version=VERSION;
 
 /* mhparse.c */
 extern char *tmp;  /* directory to place temp files */
@@ -96,7 +101,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,47 +121,47 @@ 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", argp[-2]);
+					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", argp[-2]);
+					adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]);
 				if (ntype >= NTYPES)
-					adios(NULL, "too many types (starting with %s), %d max",
+					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 OUTFILESW:
 				if (!(cp = *argp++) || (*cp == '-' && cp[1]))
-					adios(NULL, "missing argument to %s",
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
-				outfile = *cp == '-' ? cp : getcpy(expanddir(cp));
+				outfile = *cp == '-' ? cp : mh_xstrdup(expanddir(cp));
 				continue;
 
 			case VERBSW:
@@ -172,9 +177,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);
 	}
@@ -186,7 +191,7 @@ main(int argc, char **argv)
 	set_endian();
 
 	if (outfile == NULL)
-		adios(NULL, "must specify output file");
+		adios(EX_USAGE, NULL, "must specify output file");
 
 	/*
 	** Check for storage directory.  If specified,
@@ -196,17 +201,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)))
@@ -222,25 +226,23 @@ 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 (!(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++) {
@@ -255,7 +257,7 @@ main(int argc, char **argv)
 	}
 
 	if (!*cts)
-		exit(1);
+		exit(EX_SOFTWARE);
 
 	userrs = 1;
 	SIGNAL(SIGQUIT, quitser);
@@ -285,8 +287,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) {
@@ -296,7 +297,7 @@ main(int argc, char **argv)
 		context_save();  /* save the context file  */
 	}
 
-	return 0;
+	return EX_OK;
 }
 
 
@@ -325,6 +326,6 @@ pipeser(int i)
 		fflush(stderr);
 	}
 
-	exit(1);
+	exit(EX_IOERR);
 	/* NOTREACHED */
 }