X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhshow.c;h=be9cd45448109e71f27c571d31e2351391cf8c86;hp=f48fa9939862db912e56f5a8ffadc31391013ece;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=72795bfcbe9f7fee8927b1a4942c0230b0f857a8

diff --git a/uip/mhshow.c b/uip/mhshow.c
index f48fa99..be9cd45 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -42,6 +42,7 @@ static struct swit switches[] = {
 	{ NULL, 0 }
 };
 
+char *version=VERSION;
 
 /* mhparse.c */
 extern char *tmp;  /* directory to place temp files */
@@ -166,7 +167,7 @@ main(int argc, char **argv)
 				if (!(cp = *argp++) || (*cp == '-' && cp[1]))
 					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 FORMSW:
@@ -174,8 +175,8 @@ main(int argc, char **argv)
 					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
 				if (formsw)
-					free(formsw);
-				formsw = getcpy(etcpath(cp));
+					mh_free0(&formsw);
+				formsw = mh_xstrdup(etcpath(cp));
 				continue;
 
 			case VERBSW:
@@ -193,7 +194,7 @@ main(int argc, char **argv)
 			if (folder)
 				adios(EX_USAGE, NULL, "only one folder at a time!");
 			else
-				folder = getcpy(expandfol(cp));
+				folder = mh_xstrdup(expandfol(cp));
 		} else if (mode != SHOW) {
 			adios(EX_USAGE, NULL, "Either call show as `%s' or give message arguments", invo_name);
 		} else {
@@ -240,7 +241,7 @@ 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(EX_USAGE, NULL, "cannot specify msg and file at same time!");
@@ -249,8 +250,7 @@ main(int argc, char **argv)
 	** check if message is coming from file
 	*/
 	if (file) {
-		if (!(cts = (CT *) mh_xcalloc((size_t) 2, sizeof(*cts))))
-			adios(EX_OSERR, NULL, "out of memory");
+		cts = mh_xcalloc(2, sizeof(*cts));
 		ctp = cts;
 
 		if ((ct = parse_mime(file)))
@@ -304,9 +304,7 @@ main(int argc, char **argv)
 		seq_setprev(mp);  /* set the Previous-Sequence */
 		seq_setunseen(mp, 0);  /* unset unseen seqs for shown msgs */
 
-		if (!(cts = (CT *) mh_xcalloc((size_t) (mp->numsel + 1),
-				sizeof(*cts))))
-			adios(EX_OSERR, NULL, "out of memory");
+		cts = mh_xcalloc(mp->numsel + 1, sizeof(*cts));
 		ctp = cts;
 
 		/*
@@ -362,8 +360,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) {